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

Fix loading of preset artifacts and creatures on some custom maps

Browse Source
This commit is contained in:
Ivan Savenko 2023-11-26 00:41:49 +02:00
parent 3f60c1b0b3
commit 6730ec64d5
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/mapObjects/CGCreature.cpp
View File

@ -215,8 +215,12 @@ void CGCreature::pickRandomObject(CRandomGenerator & rand)
subID = VLC->creh->pickRandomMonster(rand, 7); subID = VLC->creh->pickRandomMonster(rand, 7);
break; break;
} }
if (ID != MapObjectID::MONSTER)
{
ID = MapObjectID::MONSTER; ID = MapObjectID::MONSTER;
setType(ID, subID); setType(ID, subID);
}
} }
void CGCreature::initObj(CRandomGenerator & rand) void CGCreature::initObj(CRandomGenerator & rand)

7
lib/mapObjects/MiscObjects.cpp
View File

@ -739,10 +739,13 @@ void CGArtifact::pickRandomObject(CRandomGenerator & rand)
break; break;
} }
if (ID != Obj::SPELL_SCROLL) if (ID != MapObjectID::SPELL_SCROLL && ID != MapObjectID::ARTIFACT)
{
ID = MapObjectID::ARTIFACT; ID = MapObjectID::ARTIFACT;
setType(ID, subID); setType(ID, subID);
}
else if (ID != MapObjectID::SPELL_SCROLL)
ID = MapObjectID::ARTIFACT;
} }
void CGArtifact::initObj(CRandomGenerator & rand) void CGArtifact::initObj(CRandomGenerator & rand)