games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-17 01:32:21 +02:00
Code Issues Releases Activity

Merge pull request #4022 from vcmi/master

Browse Source 
Merge master -> beta
This commit is contained in:
Ivan Savenko
2024-05-20 18:09:51 +03:00
committed by GitHub
parent d5f32c27b0 26d1e2e870
commit ffe14fc1fc
38 changed files with 238 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
client/battle/BattleInterfaceClasses.cpp
View File

@ -52,7 +52,6 @@
#include "../../lib/CTownHandler.h"
#include "../../lib/CHeroHandler.h"
#include "../../lib/StartInfo.h"
#include "../../lib/CondSh.h"
#include "../../lib/mapObjects/CGTownInstance.h"
#include "../../lib/networkPacks/PacksForClientBattle.h"
#include "../../lib/TextOperations.h"
@ -778,7 +777,7 @@ BattleResultWindow::BattleResultWindow(const BattleResult & br, CPlayerInterface
void BattleResultWindow::activate()
{
owner.showingDialog->set(true);
owner.showingDialog->setBusy();
CIntObject::activate();
}
@ -871,7 +870,7 @@ void BattleResultWindow::buttonPressed(int button)
//Result window and battle interface are gone. We requested all dialogs to be closed before opening the battle,
//so we can be sure that there is no dialogs left on GUI stack.
intTmp.showingDialog->setn(false);
intTmp.showingDialog->setFree();
CCS->videoh->close();
}