games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-04-27 12:22:45 +02:00
Code Issues Releases Activity

Use std::vector::empty for non-zero size checking.

Browse Source 
Use auto type for ocontainers iterations.
This commit is contained in:
Aleksandar Kazandzhiev 2024-07-20 12:16:13 +03:00
parent 551b87e2cd
commit cde9bed5a6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/mainmenu/CMainMenu.cpp
View File

@ -485,9 +485,9 @@ const std::vector<std::string> CMultiMode::getPlayersNames()
playerNameStr = CGI->generaltexth->translate("core.genrltxt.434"); playerNameStr = CGI->generaltexth->translate("core.genrltxt.434");
playerNames.push_back(playerNameStr); playerNames.push_back(playerNameStr);
for (JsonNode playerName : settings["general"]["multiPlayerNames"].Vector()) for (const auto & playerName : settings["general"]["multiPlayerNames"].Vector())
{ {
std::string &nameStr = playerName.String(); const std::string &nameStr = playerName.String();
if (!nameStr.empty()) if (!nameStr.empty())
{ {
playerNames.push_back(nameStr); playerNames.push_back(nameStr);
@ -549,10 +549,10 @@ void CMultiPlayers::enterSelectionScreen()
Settings playerName = settings.write["general"]["playerName"]; Settings playerName = settings.write["general"]["playerName"];
Settings multiPlayerNames = settings.write["general"]["multiPlayerNames"]; Settings multiPlayerNames = settings.write["general"]["multiPlayerNames"];
multiPlayerNames->Vector().clear(); multiPlayerNames->Vector().clear();
if (playerNames.size() > 0) if (!playerNames.empty())
{ {
playerName->String() = playerNames.front(); playerName->String() = playerNames.front();
for (std::vector<std::string>::iterator playerNameIt = playerNames.begin()+1; playerNameIt != playerNames.end(); playerNameIt++) for (auto playerNameIt = playerNames.begin()+1; playerNameIt != playerNames.end(); playerNameIt++)
{ {
multiPlayerNames->Vector().push_back(JsonNode(*playerNameIt)); multiPlayerNames->Vector().push_back(JsonNode(*playerNameIt));
} }