mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-30 04:30:42 +02:00
Reverted r1596
This commit is contained in:
parent
43c289cdd4
commit
eb42048fbc
@ -1418,8 +1418,6 @@ void CBattleInterface::deactivate()
|
||||
|
||||
void CBattleInterface::show(SDL_Surface * to)
|
||||
{
|
||||
if(bresult)
|
||||
return;
|
||||
std::map<int, CStack> stacks = curInt->cb->battleGetStacks(); //used in a few places
|
||||
++animCount;
|
||||
if(!to) //"evaluating" to
|
||||
@ -1655,6 +1653,12 @@ void CBattleInterface::show(SDL_Surface * to)
|
||||
bConsoleUp->show(to);
|
||||
bConsoleDown->show(to);
|
||||
|
||||
//showing window with result of battle
|
||||
if(resWindow)
|
||||
{
|
||||
resWindow->show(to);
|
||||
}
|
||||
|
||||
//showing in-game console
|
||||
LOCPLINT->cingconsole->show(to);
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user