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

Remove explicit convesion to int in operators

Browse Source
This commit is contained in:
Ivan Savenko
2023-11-05 18:58:07 +02:00
parent 10e110320b
commit abad4b01ce
35 changed files with 97 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/MiscObjects.cpp
View File

@ -33,7 +33,7 @@
VCMI_LIB_NAMESPACE_BEGIN
std::map <si32, std::vector<ObjectInstanceID> > CGMagi::eyelist;
std::map <MapObjectSubID, std::vector<ObjectInstanceID> > CGMagi::eyelist;
ui8 CGObelisk::obeliskCount = 0; //how many obelisks are on map
std::map<TeamID, ui8> CGObelisk::visited; //map: team_id => how many obelisks has been visited
@ -219,7 +219,7 @@ void CGMine::serializeJsonOptions(JsonSerializeFormat & handler)
for(const auto & resID : abandonedMineResources)
{
JsonNode one(JsonNode::JsonType::DATA_STRING);
one.String() = GameConstants::RESOURCE_NAMES[resID];
one.String() = GameConstants::RESOURCE_NAMES[resID.getNum()];
node.Vector().push_back(one);
}
handler.serializeRaw("possibleResources", node, std::nullopt);