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

Merge pull request #1848 from Nordsoft91/editor-fix

Browse Source 
Fix map editor crash with cutting random town
This commit is contained in:
Ivan Savenko 2023-04-02 20:09:24 +03:00 committed by GitHub
commit 1cb0c6b270
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/mapObjects/CGTownInstance.h
View File

@ -256,15 +256,18 @@ public:
h & townAndVis; h & townAndVis;
BONUS_TREE_DESERIALIZATION_FIX BONUS_TREE_DESERIALIZATION_FIX
vstd::erase_if(builtBuildings, [this](BuildingID building) -> bool if(town)
{ {
if(!town->buildings.count(building) || !town->buildings.at(building)) vstd::erase_if(builtBuildings, [this](BuildingID building) -> bool
{ {
logGlobal->error("#1444-like issue in CGTownInstance::serialize. From town %s at %s removing the bogus builtBuildings item %s", name, pos.toString(), building); if(!town->buildings.count(building) || !town->buildings.at(building))
return true; {
} logGlobal->error("#1444-like issue in CGTownInstance::serialize. From town %s at %s removing the bogus builtBuildings item %s", name, pos.toString(), building);
return false; return true;
}); }
return false;
});
}
h & overriddenBuildings; h & overriddenBuildings;