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

change data structure

Browse Source
This commit is contained in:
Laserlicht
2024-07-24 01:34:29 +02:00
parent fa7153b577
commit 268e0c8c44
5 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
server/CVCMIServer.cpp
View File

@@ -784,7 +784,7 @@ void CVCMIServer::setPlayerHandicap(PlayerColor color, PlayerSettings::Handicap
str.appendName(color);
str.appendRawString(":");
if(handicap.startBonus.empty() && handicap.percentIncome.empty())
if(handicap.startBonus.empty() && handicap.percentIncome == 100)
{
str.appendRawString(" ");
str.appendTextID("core.genrltxt.523");
@@ -793,13 +793,20 @@ void CVCMIServer::setPlayerHandicap(PlayerColor color, PlayerSettings::Handicap
}
for(auto & res : EGameResID::ALL_RESOURCES())
if(handicap.startBonus[res] != 0 && handicap.percentIncome[res] != 0)
if(handicap.startBonus[res] != 0)
{
str.appendRawString(" ");
str.appendName(res);
str.appendRawString(":");
str.appendRawString(std::to_string(handicap.startBonus[res]) + "|" + std::to_string(handicap.percentIncome[res] == 0 ? 100 : handicap.percentIncome[res]) + "%");
str.appendRawString(std::to_string(handicap.startBonus[res]));
}
if(handicap.percentIncome != 100)
{
str.appendRawString(" ");
str.appendTextID("core.jktext.32");
str.appendRawString(":");
str.appendRawString(std::to_string(handicap.percentIncome) + "%");
}
announceTxt(str);
}
@@ -1050,7 +1057,7 @@ void CVCMIServer::multiplayerWelcomeMessage()
gh->playerMessages->broadcastSystemMessage("Use '!help' to list available commands");
for (const auto & pi : si->playerInfos)
if(!pi.second.handicap.startBonus.empty() || !pi.second.handicap.percentIncome.empty())
if(!pi.second.handicap.startBonus.empty() || pi.second.handicap.percentIncome != 100)
{
MetaString str;
str.appendTextID("vcmi.lobby.handicap");
@@ -1058,13 +1065,20 @@ void CVCMIServer::multiplayerWelcomeMessage()
str.appendName(pi.first);
str.appendRawString(":");
for(auto & res : EGameResID::ALL_RESOURCES())
if(pi.second.handicap.startBonus[res] != 0 || pi.second.handicap.percentIncome[res] != 0)
if(pi.second.handicap.startBonus[res] != 0)
{
str.appendRawString(" ");
str.appendName(res);
str.appendRawString(":");
str.appendRawString(std::to_string(pi.second.handicap.startBonus[res]) + "|" + std::to_string(pi.second.handicap.percentIncome[res] == 0 ? 100 : pi.second.handicap.percentIncome[res]) + "%");
str.appendRawString(std::to_string(pi.second.handicap.startBonus[res]));
}
if(pi.second.handicap.percentIncome != 100)
{
str.appendRawString(" ");
str.appendTextID("core.jktext.32");
str.appendRawString(":");
str.appendRawString(std::to_string(pi.second.handicap.percentIncome) + "%");
}
gh->playerMessages->broadcastSystemMessage(str);
}