games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00
Code Issues Releases Activity

[Map format] fixed player options "canPlay" field

Browse Source
This commit is contained in:
AlexVinS 2017-11-16 00:03:27 +03:00
parent 5a01aba9c8
commit b8d0dfac5f
1 changed files with 50 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
lib/mapping/MapFormatJson.cpp
View File

@ -102,10 +102,20 @@ namespace HeaderDetail
"IMPOSSIBLE" "IMPOSSIBLE"
}; };
enum class ECanPlay
{
NONE = 0,
PLAYER_OR_AI = 1,
PLAYER_ONLY = 2,
AI_ONLY = 3
};
static const std::vector<std::string> canPlayMap = static const std::vector<std::string> canPlayMap =
{ {
"AIOnly", "",
"PlayerOrAI" "PlayerOrAI",
"PlayerOnly",
"AIOnly"
}; };
} }
@ -420,12 +430,48 @@ void CMapFormatJson::serializePlayerInfo(JsonSerializeFormat & handler)
info.canHumanPlay = false; info.canHumanPlay = false;
continue; continue;
} }
info.canComputerPlay = true;
} }
serializeAllowedFactions(handler, info.allowedFactions); serializeAllowedFactions(handler, info.allowedFactions);
handler.serializeEnum("canPlay", info.canHumanPlay, HeaderDetail::canPlayMap); HeaderDetail::ECanPlay canPlay = HeaderDetail::ECanPlay::NONE;
if(handler.saving)
{
if(info.canComputerPlay)
{
canPlay = info.canHumanPlay ? HeaderDetail::ECanPlay::PLAYER_OR_AI : HeaderDetail::ECanPlay::AI_ONLY;
}
else
{
canPlay = info.canHumanPlay ? HeaderDetail::ECanPlay::PLAYER_ONLY : HeaderDetail::ECanPlay::NONE;
}
}
handler.serializeEnum("canPlay", canPlay, HeaderDetail::canPlayMap);
if(!handler.saving)
{
switch(canPlay)
{
case HeaderDetail::ECanPlay::PLAYER_OR_AI:
info.canComputerPlay = true;
info.canHumanPlay = true;
break;
case HeaderDetail::ECanPlay::PLAYER_ONLY:
info.canComputerPlay = false;
info.canHumanPlay = true;
break;
case HeaderDetail::ECanPlay::AI_ONLY:
info.canComputerPlay = true;
info.canHumanPlay = false;
break;
default:
info.canComputerPlay = false;
info.canHumanPlay = false;
break;
}
}
//saving whole structure only if position is valid //saving whole structure only if position is valid
if(!handler.saving || info.posOfMainTown.valid()) if(!handler.saving || info.posOfMainTown.valid())