1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-24 03:47:18 +02:00

* improved "WAIT" handling

* splitting stacks with the shift+click
This commit is contained in:
Michał W. Urbańczyk 2009-01-25 22:56:37 +00:00
parent 7405549733
commit 6a16d134bf
4 changed files with 8 additions and 5 deletions

View File

@ -1780,7 +1780,6 @@ CStack * BattleInfo::getNextStack()
||vstd::contains(stacks[i]->state,WAITING)
||vstd::contains(stacks[i]->state,MOVED)
||!stacks[i]->alive()
||stacks[i] == current
)
continue;
return stacks[i];
@ -1790,7 +1789,6 @@ CStack * BattleInfo::getNextStack()
if(vstd::contains(stacks[i]->state,DEFENDING)
||vstd::contains(stacks[i]->state,MOVED)
||!stacks[i]->alive()
||stacks[i] == current
)
continue;
return stacks[i];

View File

@ -213,7 +213,10 @@ void CGarrisonSlot::clickLeft(tribool down)
show();
refr = true;
}
else if( !creature && owner->splitting)//split
else if(!creature
&& (owner->splitting
|| SDL_GetKeyState(NULL)[SDLK_LSHIFT]
|| SDL_GetKeyState(NULL)[SDLK_RSHIFT]))//split
{
owner->p2 = ID;
owner->pb = upg;

View File

@ -1188,7 +1188,7 @@ void MapSel::init()
{
if( fs::file_size(dir->path()) < 16000 )
{
tlog3 << "Savegame " << dir->path() << " seems to be corrupted and will be ommited.\n";
tlog3 << "\t\tWarning: savegame " << dir->path().filename() << " seems to be corrupted and will be ommited.\n";
continue;
}
pliczkiTemp.push_back("Games/"+(dir->path().leaf()));

View File

@ -1,4 +1,4 @@
0.64 -> 0.next (???) [as for r681]
0.64 -> 0.next (???) [as for r689]
GENERAL:
* move some settings to the config/settings.txt file
* partial support for new screen resolutions
@ -6,6 +6,7 @@ GENERAL:
* fixed crashbug occuring when hero levelled above 15 level
* support for non-standard screen resolutions
* F4 toggles between full-screen and windowed mode (experimental)
* splitting stacks the shift+click
* minor improvements in creature card window
ADVENTURE INTERFACE:
@ -27,6 +28,7 @@ BATTLES
* positive/negative spells cannot be cast on hostile/our stacks
* showing spell effects affecting stack in creature info window
* more appropriate coloring of stack amount box when stack is affected by a spell
* battle console displays notifications about wait/defend commands
* several reported bugs fixed
* new spells supported:
a) Haste