diff options
| author | Travis Howell | 2010-04-03 04:48:20 +0000 |
|---|---|---|
| committer | Travis Howell | 2010-04-03 04:48:20 +0000 |
| commit | 397553cc569370db4da63a70f841671f7130655b (patch) | |
| tree | 79c3a9db3c5053501412e472388e12c5848e4869 | |
| parent | 0d83045b5fcc317cbed22b194ff9cb0a6eb6c61f (diff) | |
| download | scummvm-rg350-397553cc569370db4da63a70f841671f7130655b.tar.gz scummvm-rg350-397553cc569370db4da63a70f841671f7130655b.tar.bz2 scummvm-rg350-397553cc569370db4da63a70f841671f7130655b.zip | |
Fix bug #2970141 - NIPPON: Crash at end of the game (regression). By reverting part of the changes to Parallaction_ns::cleanupGame() in revision 34939.
svn-id: r48480
| -rw-r--r-- | engines/parallaction/parallaction.h | 2 | ||||
| -rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h index 49be0ea53c..befca63930 100644 --- a/engines/parallaction/parallaction.h +++ b/engines/parallaction/parallaction.h @@ -173,7 +173,6 @@ struct Location { protected: int _gameType; - void freeZones(bool removeAll); bool keepZone_br(ZonePtr z); bool keepZone_ns(ZonePtr z); @@ -191,6 +190,7 @@ public: ZonePtr findZone(const char *name); void cleanup(bool removeAll); + void freeZones(bool removeAll); int getScale(int z) const; }; diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index 2ce69abb84..7c08e426a2 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -515,7 +515,7 @@ void Parallaction_ns::cleanupGame() { memset(_localFlags, 0, sizeof(_localFlags)); memset(_locationNames, 0, sizeof(_locationNames)); - freeLocation(true); + _location.freeZones(true); _score = 0; _freeSarcophagusSlotX = INITIAL_FREE_SARCOPHAGUS_SLOT_X; |