games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/develop' into boats

Browse Source 
# Conflicts:
#	AI/VCAI/Pathfinding/AINodeStorage.cpp
This commit is contained in:
nordsoft
2023-04-19 02:22:19 +04:00
parent 008db447e7 ff5e98e78b
commit 0a28262c15
164 changed files with 1947 additions and 1406 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/mapObjects/CGTownInstance.cpp
View File

@@ -1506,7 +1506,7 @@ void CGTownInstance::serializeJsonOptions(JsonSerializeFormat & handler)
auto rawId = VLC->modh->identifiers.getIdentifier(CModHandler::scopeMap(), getTown()->getBuildingScope(), identifier);
if(rawId)
return rawId.get();
return rawId.value();
else
return -1;
};