From b76ad3dc4ff3448c360e23e9af4aaf80ca2e1501 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Thu, 26 Feb 2009 14:42:03 +0000
Subject: changeLocation now uses the internal variable _newLocationName
 instead of an input parameter.

svn-id: r38902
---
 engines/parallaction/parallaction_ns.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'engines/parallaction/parallaction_ns.cpp')

diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index a94d4a90b6..8d0317f1f2 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -288,7 +288,15 @@ void Parallaction_ns::runPendingZones() {
 //	changeLocation handles transitions between locations, and is able to display slides
 //	between one and the other.
 //
-void Parallaction_ns::changeLocation(char *location) {
+void Parallaction_ns::changeLocation() {
+    if (_newLocationName.empty()) {
+        return;
+    }
+
+    char location[200];
+    strcpy(location, _newLocationName.c_str());
+    strcpy(_location._name, _newLocationName.c_str());
+
 	debugC(1, kDebugExec, "changeLocation(%s)", location);
 
 	MouseTriState oldMouseState = _input->getMouseState();
@@ -368,6 +376,7 @@ void Parallaction_ns::changeLocation(char *location) {
 	}
 
 	debugC(1, kDebugExec, "changeLocation() done");
+	_newLocationName.clear();
 }
 
 
-- 
cgit v1.2.3