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

[peres001 at users.sourceforge.net]

Revision: 29356
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29356&view=rev
Author:   peres001
Date:     2007-11-01 08:15:43 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
Fix regression introduced in revision 29355. First loadgame performed was destroying the game flags.

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

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

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-11-01 14:47:33 UTC (rev 29355)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-11-01 15:15:43 UTC (rev 29356)
@@ -263,6 +263,8 @@
 
 	guiStart();
 
+	_engineFlags &= ~kEngineChangeLocation;
+
 	LocationName locname;
 	locname.bind(_location._name);
 

Modified: scummvm/trunk/engines/parallaction/saveload.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/saveload.cpp	2007-11-01 14:47:33 UTC (rev 29355)
+++ scummvm/trunk/engines/parallaction/saveload.cpp	2007-11-01 15:15:43 UTC (rev 29356)
@@ -92,16 +92,15 @@
 	if (!f) return;
 
 	char s[30];
+	char n[16];
+	char l[16];
 
 	f->readLine(s, 29);
 
-	f->readLine(s, 15);
-	_char.setName(s);
+	f->readLine(n, 15);
 
-	f->readLine(_location._name, 15);
+	f->readLine(l, 15);
 
-	strcat(_location._name, ".");
-
 	f->readLine(s, 15);
 	_location._startPosition.x = atoi(s);
 
@@ -160,7 +159,7 @@
 	// bugs, but it's a good maneuver anyway
 	strcpy(_characterName1, "null");
 
-	strcat(_location._name, _char.getName());
+	sprintf(_location._name, "%s.%s" , l, n);
 	_engineFlags |= kEngineChangeLocation;
 
 	return;


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