[Scummvm-cvs-logs] SF.net SVN: scummvm:[48481] scummvm/branches/branch-1-1-0/engines/ parallaction

[Kirben at users.sourceforge.net]

Revision: 48481
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48481&view=rev
Author:   Kirben
Date:     2010-04-03 04:59:53 +0000 (Sat, 03 Apr 2010)

Log Message:
-----------
Backport fix for bug #2970141 - NIPPON: Crash at end of the game (regression). By reverting part of the changes to Parallaction_ns::cleanupGame() in revision 34939.

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=34939&view=rev

Modified Paths:
--------------
    scummvm/branches/branch-1-1-0/engines/parallaction/parallaction.h
    scummvm/branches/branch-1-1-0/engines/parallaction/parallaction_ns.cpp

Modified: scummvm/branches/branch-1-1-0/engines/parallaction/parallaction.h
===================================================================
--- scummvm/branches/branch-1-1-0/engines/parallaction/parallaction.h	2010-04-03 04:48:20 UTC (rev 48480)
+++ scummvm/branches/branch-1-1-0/engines/parallaction/parallaction.h	2010-04-03 04:59:53 UTC (rev 48481)
@@ -172,7 +172,6 @@
 
 protected:
 	int			_gameType;
-	void freeZones(bool removeAll);
 
 	bool keepZone_br(ZonePtr z);
 	bool keepZone_ns(ZonePtr z);
@@ -190,6 +189,7 @@
 	ZonePtr findZone(const char *name);
 
 	void cleanup(bool removeAll);
+	void freeZones(bool removeAll);
 
 	int getScale(int z) const;
 };

Modified: scummvm/branches/branch-1-1-0/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/branches/branch-1-1-0/engines/parallaction/parallaction_ns.cpp	2010-04-03 04:48:20 UTC (rev 48480)
+++ scummvm/branches/branch-1-1-0/engines/parallaction/parallaction_ns.cpp	2010-04-03 04:59:53 UTC (rev 48481)
@@ -515,7 +515,7 @@
 	memset(_localFlags, 0, sizeof(_localFlags));
 	memset(_locationNames, 0, sizeof(_locationNames));
 
-	freeLocation(true);
+	_location.freeZones(true);
 
 	_score = 0;
 	_freeSarcophagusSlotX = INITIAL_FREE_SARCOPHAGUS_SLOT_X;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.