aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2009-02-26 14:42:03 +0000
committerNicola Mettifogo2009-02-26 14:42:03 +0000
commitb76ad3dc4ff3448c360e23e9af4aaf80ca2e1501 (patch)
tree4f171c2cfa1d4f382d118c853a38f50fbdd7520d /engines/parallaction/parallaction.cpp
parent868b589af62d8afec68265651d807c183c4659bf (diff)
downloadscummvm-rg350-b76ad3dc4ff3448c360e23e9af4aaf80ca2e1501.tar.gz
scummvm-rg350-b76ad3dc4ff3448c360e23e9af4aaf80ca2e1501.tar.bz2
scummvm-rg350-b76ad3dc4ff3448c360e23e9af4aaf80ca2e1501.zip
changeLocation now uses the internal variable _newLocationName instead of an input parameter.
svn-id: r38902
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
-rw-r--r--engines/parallaction/parallaction.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index c3b5799e08..7565346e39 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -338,7 +338,7 @@ void Parallaction::runGameFrame(int event) {
return;
if (_engineFlags & kEngineChangeLocation) {
- changeLocation(_location._name);
+ changeLocation();
}
_programExec->runScripts(_location._programs.begin(), _location._programs.end());
@@ -954,7 +954,7 @@ void Parallaction::beep() {
void Parallaction::scheduleLocationSwitch(const char *location) {
debugC(9, kDebugExec, "scheduleLocationSwitch(%s)\n", location);
- strcpy(_location._name, location);
+ _newLocationName = location;
_engineFlags |= kEngineChangeLocation;
}