diff options
author | Nicola Mettifogo | 2007-11-06 20:49:50 +0000 |
---|---|---|
committer | Nicola Mettifogo | 2007-11-06 20:49:50 +0000 |
commit | 9038ee91154c1a9377e596c1c0a44ccbc111e7a1 (patch) | |
tree | be29b66531a1f530ca8d421b3bb56f731353b174 | |
parent | b820b661c7b691cfcb86408954cde6f71da5654e (diff) | |
download | scummvm-rg350-9038ee91154c1a9377e596c1c0a44ccbc111e7a1.tar.gz scummvm-rg350-9038ee91154c1a9377e596c1c0a44ccbc111e7a1.tar.bz2 scummvm-rg350-9038ee91154c1a9377e596c1c0a44ccbc111e7a1.zip |
Fixed regression: loading from the start screens was messing up game flags.
svn-id: r29439
-rw-r--r-- | engines/parallaction/parallaction.cpp | 1 | ||||
-rw-r--r-- | engines/parallaction/parallaction_ns.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp index 6dbcbca50b..c0e7bbddcc 100644 --- a/engines/parallaction/parallaction.cpp +++ b/engines/parallaction/parallaction.cpp @@ -301,7 +301,6 @@ void Parallaction::runGame() { } if (_engineFlags & kEngineChangeLocation) { - _engineFlags &= ~kEngineChangeLocation; changeLocation(_location._name); continue; } diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp index 9a8419fffb..4105ed3f16 100644 --- a/engines/parallaction/parallaction_ns.cpp +++ b/engines/parallaction/parallaction_ns.cpp @@ -404,6 +404,8 @@ void Parallaction_ns::changeLocation(char *location) { debugC(1, kDebugExec, "changeLocation() done"); + _engineFlags &= ~kEngineChangeLocation; + return; } |