diff options
author | Nicola Mettifogo | 2009-02-26 14:42:03 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2009-02-26 14:42:03 +0000 |
commit | b76ad3dc4ff3448c360e23e9af4aaf80ca2e1501 (patch) | |
tree | 4f171c2cfa1d4f382d118c853a38f50fbdd7520d /engines/parallaction/parallaction_ns.cpp | |
parent | 868b589af62d8afec68265651d807c183c4659bf (diff) | |
download | scummvm-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_ns.cpp')
-rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
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(); } |