games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Reverted r1596

Browse Source
This commit is contained in:
Michał W. Urbańczyk
2010-06-01 19:05:30 +00:00
parent 43c289cdd4
commit eb42048fbc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/CBattleInterface.cpp
View File

@@ -1418,8 +1418,6 @@ void CBattleInterface::deactivate()
void CBattleInterface::show(SDL_Surface * to) void CBattleInterface::show(SDL_Surface * to)
{ {
if(bresult)
return;
std::map<int, CStack> stacks = curInt->cb->battleGetStacks(); //used in a few places std::map<int, CStack> stacks = curInt->cb->battleGetStacks(); //used in a few places
++animCount; ++animCount;
if(!to) //"evaluating" to if(!to) //"evaluating" to
@@ -1655,6 +1653,12 @@ void CBattleInterface::show(SDL_Surface * to)
bConsoleUp->show(to); bConsoleUp->show(to);
bConsoleDown->show(to); bConsoleDown->show(to);
//showing window with result of battle
if(resWindow)
{
resWindow->show(to);
}
//showing in-game console //showing in-game console
LOCPLINT->cingconsole->show(to); LOCPLINT->cingconsole->show(to);