[Scummvm-cvs-logs] SF.net SVN: scummvm:[45145] scummvm/trunk/engines/parallaction/ parallaction_ns.cpp

[peres001 at users.sourceforge.net]

Revision: 45145
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45145&view=rev
Author:   peres001
Date:     2009-10-16 03:49:27 +0000 (Fri, 16 Oct 2009)

Log Message:
-----------
Fixed bug 2879799. Freshly loaded data was erased when changing to the new location and the character stayed the same.

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction_ns.cpp

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2009-10-16 02:02:55 UTC (rev 45144)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2009-10-16 03:49:27 UTC (rev 45145)
@@ -351,19 +351,8 @@
 	LocationName locname;
 	locname.bind(location);
 
-	bool fullCleanup = false;
-	if (locname.hasCharacter()) {
-		CharacterName newName(locname.character());
-		fullCleanup = (strcmp(newName.getBaseName(), _char.getBaseName()));
-	}
+	freeLocation(false);
 
-	if (fullCleanup) {
-		cleanupGame();
-	} else {
-		freeLocation(false);
-	}
-
-
 	if (locname.hasSlide()) {
 		showSlide(locname.slide());
 		uint id = _gfx->createLabel(_menuFont, _location._slideText[0].c_str(), 1);


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