Fix regression introduced in revision 29355. First loadgame performed was destroying the game flags.

svn-id: r29356

2 files changed, 7 insertions, 6 deletions

diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 500ba79de7..0e73c1fc2e 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -263,6 +263,8 @@ int Parallaction_ns::go() {
 
 	guiStart();
 
+	_engineFlags &= ~kEngineChangeLocation;
+
 	LocationName locname;
 	locname.bind(_location._name);
 
diff --git a/engines/parallaction/saveload.cpp b/engines/parallaction/saveload.cpp
index 28839c2f26..562d4119ea 100644
--- a/engines/parallaction/saveload.cpp
+++ b/engines/parallaction/saveload.cpp
@@ -92,15 +92,14 @@ void Parallaction_ns::doLoadGame(uint16 slot) {
 	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(_location._name, 15);
+	f->readLine(n, 15);
 
-	strcat(_location._name, ".");
+	f->readLine(l, 15);
 
 	f->readLine(s, 15);
 	_location._startPosition.x = atoi(s);
@@ -160,7 +159,7 @@ void Parallaction_ns::doLoadGame(uint16 slot) {
 	// 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;