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

[peres001 at users.sourceforge.net]

Revision: 26190
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26190&view=rev
Author:   peres001
Date:     2007-03-18 01:29:45 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
Bug fixed: inventory wasn't refreshed when loading a savegame if character was not switched. To make things clearer, character are now forced to reload all of their data on switch/load.

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

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-18 08:15:54 UTC (rev 26189)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-03-18 08:29:45 UTC (rev 26190)
@@ -793,8 +793,9 @@
 
 	if (scumm_stricmp(v32, _characterName1)) {
 
-		if (scumm_stricmp(_characterName1, "null"))
-			freeCharacter();
+		// freeCharacter takes responsibility for checking
+		// character for sanity before memory is freed
+		freeCharacter();
 
 		_disk->selectArchive("disk1");
 

Modified: scummvm/trunk/engines/parallaction/saveload.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/saveload.cpp	2007-03-18 08:15:54 UTC (rev 26189)
+++ scummvm/trunk/engines/parallaction/saveload.cpp	2007-03-18 08:29:45 UTC (rev 26190)
@@ -134,6 +134,10 @@
 
 	parseLocation("common");
 
+	// force reload of character to solve inventory
+	// bugs, but it's a good maneuver anyway
+	strcpy(_characterName1, "null");
+
 	strcat(_vm->_location._name, _vm->_characterName);
 	_engineFlags |= kEngineChangeLocation;
 


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