Explorar el Código

Reverted r1596

Michał W. Urbańczyk hace 15 años
padre
commit
eb42048fbc
Se han modificado 1 ficheros con 6 adiciones y 2 borrados
  1. 6 2
      client/CBattleInterface.cpp

+ 6 - 2
client/CBattleInterface.cpp

@@ -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);