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

Fixed delayed updates in timer editing, limited to 24 hours at most

Browse Source
This commit is contained in:
Ivan Savenko
2024-01-13 22:31:26 +02:00
parent 8303ce5d13
commit fc163898d9
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
client/lobby/OptionsTabBase.cpp
View File

@ -22,6 +22,14 @@
#include "../../lib/MetaString.h" #include "../../lib/MetaString.h"
#include "../../lib/CGeneralTextHandler.h" #include "../../lib/CGeneralTextHandler.h"
static std::string timeToString(int time)
{
std::stringstream ss;
ss << time / 1000 / 60 << ":" << std::setw(2) << std::setfill('0') << time / 1000 % 60;
return ss.str();
};
std::vector<TurnTimerInfo> OptionsTabBase::getTimerPresets() const std::vector<TurnTimerInfo> OptionsTabBase::getTimerPresets() const
{ {
std::vector<TurnTimerInfo> result; std::vector<TurnTimerInfo> result;
@ -141,43 +149,51 @@ OptionsTabBase::OptionsTabBase(const JsonPath & configPath)
else if(l.empty()) else if(l.empty())
return sec; return sec;
return std::stoi(l) * 60 + std::stoi(r); return std::min(24*60, std::stoi(l)) * 60 + std::stoi(r);
}; };
addCallback("parseAndSetTimer_base", [parseTimerString](const std::string & str){ addCallback("parseAndSetTimer_base", [this, parseTimerString](const std::string & str){
int time = parseTimerString(str) * 1000; int time = parseTimerString(str) * 1000;
if(time >= 0) if(time >= 0)
{ {
TurnTimerInfo tinfo = SEL->getStartInfo()->turnTimerInfo; TurnTimerInfo tinfo = SEL->getStartInfo()->turnTimerInfo;
tinfo.baseTimer = time; tinfo.baseTimer = time;
CSH->setTurnTimerInfo(tinfo); CSH->setTurnTimerInfo(tinfo);
if(auto ww = widget<CTextInput>("chessFieldBase"))
ww->setText(timeToString(time), false);
} }
}); });
addCallback("parseAndSetTimer_turn", [parseTimerString](const std::string & str){ addCallback("parseAndSetTimer_turn", [this, parseTimerString](const std::string & str){
int time = parseTimerString(str) * 1000; int time = parseTimerString(str) * 1000;
if(time >= 0) if(time >= 0)
{ {
TurnTimerInfo tinfo = SEL->getStartInfo()->turnTimerInfo; TurnTimerInfo tinfo = SEL->getStartInfo()->turnTimerInfo;
tinfo.turnTimer = time; tinfo.turnTimer = time;
CSH->setTurnTimerInfo(tinfo); CSH->setTurnTimerInfo(tinfo);
if(auto ww = widget<CTextInput>("chessFieldTurn"))
ww->setText(timeToString(time), false);
} }
}); });
addCallback("parseAndSetTimer_battle", [parseTimerString](const std::string & str){ addCallback("parseAndSetTimer_battle", [this, parseTimerString](const std::string & str){
int time = parseTimerString(str) * 1000; int time = parseTimerString(str) * 1000;
if(time >= 0) if(time >= 0)
{ {
TurnTimerInfo tinfo = SEL->getStartInfo()->turnTimerInfo; TurnTimerInfo tinfo = SEL->getStartInfo()->turnTimerInfo;
tinfo.battleTimer = time; tinfo.battleTimer = time;
CSH->setTurnTimerInfo(tinfo); CSH->setTurnTimerInfo(tinfo);
if(auto ww = widget<CTextInput>("chessFieldBattle"))
ww->setText(timeToString(time), false);
} }
}); });
addCallback("parseAndSetTimer_unit", [parseTimerString](const std::string & str){ addCallback("parseAndSetTimer_unit", [this, parseTimerString](const std::string & str){
int time = parseTimerString(str) * 1000; int time = parseTimerString(str) * 1000;
if(time >= 0) if(time >= 0)
{ {
TurnTimerInfo tinfo = SEL->getStartInfo()->turnTimerInfo; TurnTimerInfo tinfo = SEL->getStartInfo()->turnTimerInfo;
tinfo.unitTimer = time; tinfo.unitTimer = time;
CSH->setTurnTimerInfo(tinfo); CSH->setTurnTimerInfo(tinfo);
if(auto ww = widget<CTextInput>("chessFieldUnit"))
ww->setText(timeToString(time), false);
} }
}); });
@ -359,14 +375,6 @@ void OptionsTabBase::recreate()
} }
} }
//chess timer
auto timeToString = [](int time) -> std::string
{
std::stringstream ss;
ss << time / 1000 / 60 << ":" << std::setw(2) << std::setfill('0') << time / 1000 % 60;
return ss.str();
};
if(auto ww = widget<CTextInput>("chessFieldBase")) if(auto ww = widget<CTextInput>("chessFieldBase"))
ww->setText(timeToString(turnTimerRemote.baseTimer), false); ww->setText(timeToString(turnTimerRemote.baseTimer), false);
if(auto ww = widget<CTextInput>("chessFieldTurn")) if(auto ww = widget<CTextInput>("chessFieldTurn"))