aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2018-04-05 22:10:50 -0400
committerPaul Gilbert2018-04-05 22:10:50 -0400
commitc9460d1340ab29cd453a8e4547ee6abccc51093c (patch)
treec9bc8854ded3064c0aa660375806476242f97e79
parent8648a48080895308cf79c7fe99ecfebcb08c7528 (diff)
downloadscummvm-rg350-c9460d1340ab29cd453a8e4547ee6abccc51093c.tar.gz
scummvm-rg350-c9460d1340ab29cd453a8e4547ee6abccc51093c.tar.bz2
scummvm-rg350-c9460d1340ab29cd453a8e4547ee6abccc51093c.zip
XEEN: Remove map load assert to allow Northern Sphinx map to load
-rw-r--r--engines/xeen/map.cpp2
-rw-r--r--engines/xeen/scripts.cpp2
2 files changed, 1 insertions, 3 deletions
diff --git a/engines/xeen/map.cpp b/engines/xeen/map.cpp
index 24a10bf448..53b16326d8 100644
--- a/engines/xeen/map.cpp
+++ b/engines/xeen/map.cpp
@@ -463,8 +463,6 @@ void MonsterObjectData::synchronize(XeenSerializer &s, MonsterData &monsterData)
if (obj._id < (int)_objectSprites.size()) {
obj._spriteId = _objectSprites[obj._id]._spriteId;
obj._sprites = &_objectSprites[obj._id]._sprites;
- } else {
- assert(!obj._id);
}
_objects.push_back(obj);
diff --git a/engines/xeen/scripts.cpp b/engines/xeen/scripts.cpp
index 202bbd0a82..82d53040c1 100644
--- a/engines/xeen/scripts.cpp
+++ b/engines/xeen/scripts.cpp
@@ -1617,7 +1617,7 @@ bool Scripts::ifProc(int action, uint32 val, int mode, int charIndex) {
v = party._gems;
break;
case 37:
- // Might bonus (extra beond base)
+ // Might bonus (extra beyond base)
v = ps->_might._temporary;
break;
case 38: