games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Minor changes

Browse Source
This commit is contained in:
nordsoft 2023-08-25 20:49:27 +04:00
parent 86e0ea15fb
commit 1e527a6942
3 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/battle/BattleWindow.cpp
View File

@ -51,7 +51,7 @@ BattleWindow::BattleWindow(BattleInterface & owner):
REGISTER_BUILDER("battleConsole", &BattleWindow::buildBattleConsole); REGISTER_BUILDER("battleConsole", &BattleWindow::buildBattleConsole);
const JsonNode config(ResourceID("config/widgets/BattleWindow2.json")); const JsonNode config(ResourceID("config/widgets/BattleWindow.json"));
addShortcut(EShortcut::GLOBAL_OPTIONS, std::bind(&BattleWindow::bOptionsf, this)); addShortcut(EShortcut::GLOBAL_OPTIONS, std::bind(&BattleWindow::bOptionsf, this));
addShortcut(EShortcut::BATTLE_SURRENDER, std::bind(&BattleWindow::bSurrenderf, this)); addShortcut(EShortcut::BATTLE_SURRENDER, std::bind(&BattleWindow::bSurrenderf, this));

2
client/lobby/OptionsTab.cpp
View File

@ -176,7 +176,7 @@ void OptionsTab::recreate()
if(auto turnSlider = widget<CSlider>("sliderTurnDuration")) if(auto turnSlider = widget<CSlider>("sliderTurnDuration"))
{ {
if(!variables["timerPresets"].isNull()) if(turnSlider->isActive() && !variables["timerPresets"].isNull())
{ {
for(int idx = 0; idx < variables["timerPresets"].Vector().size(); ++idx) for(int idx = 0; idx < variables["timerPresets"].Vector().size(); ++idx)
{ {

0
config/widgets/battleWindow2.json → config/widgets/battleWindow.json
View File