thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

XEEN: Remove map load assert to allow Northern Sphinx map to load

Browse source
This commit is contained in:
Paul Gilbert 2018-04-05 22:10:50 -04:00
parent 8648a48080
commit c9460d1340
2 changed files with 1 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/xeen/map.cpp
View file

@ -463,8 +463,6 @@ void MonsterObjectData::synchronize(XeenSerializer &s, MonsterData &monsterData)
if (obj._id < (int)_objectSprites.size()) { if (obj._id < (int)_objectSprites.size()) {
obj._spriteId = _objectSprites[obj._id]._spriteId; obj._spriteId = _objectSprites[obj._id]._spriteId;
obj._sprites = &_objectSprites[obj._id]._sprites; obj._sprites = &_objectSprites[obj._id]._sprites;
} else {
assert(!obj._id);
} }
_objects.push_back(obj); _objects.push_back(obj);

2
engines/xeen/scripts.cpp
View file

@ -1617,7 +1617,7 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
v = party._gems; v = party._gems;
break; break;
case 37: case 37:
// Might bonus (extra beond base) // Might bonus (extra beyond base)
v = ps->_might._temporary; v = ps->_might._temporary;
break; break;
case 38: case 38: