mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-19 08:06:42 +00:00
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
This commit is contained in:
parent
0d83045b5f
commit
397553cc56
@ -173,7 +173,6 @@ struct Location {
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
int _gameType;
|
int _gameType;
|
||||||
void freeZones(bool removeAll);
|
|
||||||
|
|
||||||
bool keepZone_br(ZonePtr z);
|
bool keepZone_br(ZonePtr z);
|
||||||
bool keepZone_ns(ZonePtr z);
|
bool keepZone_ns(ZonePtr z);
|
||||||
@ -191,6 +190,7 @@ public:
|
|||||||
ZonePtr findZone(const char *name);
|
ZonePtr findZone(const char *name);
|
||||||
|
|
||||||
void cleanup(bool removeAll);
|
void cleanup(bool removeAll);
|
||||||
|
void freeZones(bool removeAll);
|
||||||
|
|
||||||
int getScale(int z) const;
|
int getScale(int z) const;
|
||||||
};
|
};
|
||||||
|
@ -515,7 +515,7 @@ void Parallaction_ns::cleanupGame() {
|
|||||||
memset(_localFlags, 0, sizeof(_localFlags));
|
memset(_localFlags, 0, sizeof(_localFlags));
|
||||||
memset(_locationNames, 0, sizeof(_locationNames));
|
memset(_locationNames, 0, sizeof(_locationNames));
|
||||||
|
|
||||||
freeLocation(true);
|
_location.freeZones(true);
|
||||||
|
|
||||||
_score = 0;
|
_score = 0;
|
||||||
_freeSarcophagusSlotX = INITIAL_FREE_SARCOPHAGUS_SLOT_X;
|
_freeSarcophagusSlotX = INITIAL_FREE_SARCOPHAGUS_SLOT_X;
|
||||||
|
Loading…
Reference in New Issue
Block a user