diff options
author | Travis Howell | 2006-09-20 06:39:27 +0000 |
---|---|---|
committer | Travis Howell | 2006-09-20 06:39:27 +0000 |
commit | e63717a2eb4df76fb97736daebb40b72c2f888fa (patch) | |
tree | 3326874a5d61b5940fea0dea912b6daad4ed795b /engines/simon/simon.cpp | |
parent | 68360e4ddedd8806d269320bac91ab6cace34a18 (diff) | |
download | scummvm-rg350-e63717a2eb4df76fb97736daebb40b72c2f888fa.tar.gz scummvm-rg350-e63717a2eb4df76fb97736daebb40b72c2f888fa.tar.bz2 scummvm-rg350-e63717a2eb4df76fb97736daebb40b72c2f888fa.zip |
Fix crashes during WW startup
svn-id: r23944
Diffstat (limited to 'engines/simon/simon.cpp')
-rw-r--r-- | engines/simon/simon.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/simon/simon.cpp b/engines/simon/simon.cpp index 9a254c28ce..0ccce68968 100644 --- a/engines/simon/simon.cpp +++ b/engines/simon/simon.cpp @@ -105,6 +105,8 @@ SimonEngine::SimonEngine(OSystem *syst) _stringIdLocalMin = 0; _stringIdLocalMax = 0; + _roomsList = 0; + _xtblList = 0; _xtablesHeapPtrOrg = 0; _xtablesHeapCurPosOrg = 0; @@ -769,7 +771,6 @@ Item *SimonEngine::getNextItemPtr() { case -7: return actor(); case -9: - assert (derefItem(me()->parent) != NULL); return derefItem(me()->parent); default: return derefItem(a); |