games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-03 00:46:55 +02:00
Code Issues Releases Activity

Merge pull request #2698 from Nordsoft91/turn-timer

Browse Source 
Turn timer fixes
This commit is contained in:
Nordsoft91
2023-09-01 00:31:52 +04:00
committed by GitHub
parent ab2d4ba471 d7f0698651
commit c45ab07d0b
15 changed files with 305 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/gui/InterfaceObjectConfigurable.cpp
View File

@ -158,6 +158,8 @@ std::string InterfaceObjectConfigurable::readText(const JsonNode & config) const
return "";
std::string s = config.String();
if(s.empty())
return s;
logGlobal->debug("Reading text from translations by key: %s", s);
return CGI->generaltexth->translate(s);
}
@ -579,8 +581,8 @@ std::shared_ptr<CTextInput> InterfaceObjectConfigurable::buildTextInput(const Js
result->font = readFont(config["font"]);
if(!config["color"].isNull())
result->setColor(readColor(config["color"]));
if(!config["text"].isNull())
result->setText(readText(config["text"]));
if(!config["text"].isNull() && config["text"].isString())
result->setText(config["text"].String()); //for input field raw string is taken
if(!config["callback"].isNull())
result->cb += callbacks_string.at(config["callback"].String());
if(!config["help"].isNull())