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

More fixes for map-specific crashes, fixes #1427 and #733

Browse Source 
- if special victory condition is present AND there is only one player
normal victory condition will be disabled
- added new triggered condition, constant value
- if target of CONTROL/DESTROY condition is removed from map, triggered
condition will be replaced with constant
- fixed randomization of armies with random stacks
This commit is contained in:
Ivan Savenko
2014-02-09 12:10:02 +00:00
parent 30aa07f86c
commit 7f07a30d7d
9 changed files with 59 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/mapping/MapFormatH3M.cpp
View File

@ -337,6 +337,17 @@ void CMapLoaderH3M::readVictoryLossConditions()
bool allowNormalVictory = reader.readBool();
bool appliesToAI = reader.readBool();
if (allowNormalVictory)
{
size_t playersOnMap = boost::range::count_if(mapHeader->players,[](const PlayerInfo & info) { return info.canAnyonePlay();});
if (playersOnMap == 1)
{
logGlobal->warnStream() << "Map " << mapHeader->name << " has only one player but allows normal victory?";
allowNormalVictory = false; // makes sense? Not much. Works as H3? Yes!
}
}
switch(vicCondition)
{
case EVictoryConditionType::ARTIFACT:
@ -1660,7 +1671,8 @@ void CMapLoaderH3M::readCreatureSet(CCreatureSet * out, int number)
count = reader.readUInt16();
// Empty slot
if(creID == maxID) continue;
if(creID == maxID)
continue;
auto hlp = new CStackInstance();
hlp->count = count;
@ -1668,8 +1680,7 @@ void CMapLoaderH3M::readCreatureSet(CCreatureSet * out, int number)
if(creID > maxID - 0xf)
{
//this will happen when random object has random army
creID = CreatureID(maxID + 1 - creID + VLC->creh->creatures.size());
hlp->idRand = creID;
hlp->idRand = maxID - creID - 1;
}
else
{