aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction
diff options
context:
space:
mode:
authorNicola Mettifogo2007-11-18 18:04:41 +0000
committerNicola Mettifogo2007-11-18 18:04:41 +0000
commit9e58b0253d40efb2513755e7f09b17e12fdecdc8 (patch)
treec7ab9e76e2473dc45479a96168b26d1b657c954c /engines/parallaction
parent6a4ce78789a4297a46e3528eaaf48601c1461549 (diff)
downloadscummvm-rg350-9e58b0253d40efb2513755e7f09b17e12fdecdc8.tar.gz
scummvm-rg350-9e58b0253d40efb2513755e7f09b17e12fdecdc8.tar.bz2
scummvm-rg350-9e58b0253d40efb2513755e7f09b17e12fdecdc8.zip
Removed other paranoia code from the original engine (as in revision 29505).
svn-id: r29558
Diffstat (limited to 'engines/parallaction')
-rw-r--r--engines/parallaction/parallaction.cpp2
-rw-r--r--engines/parallaction/parallaction_ns.cpp12
2 files changed, 3 insertions, 11 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 54bf992dcd..169d8198ca 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -906,6 +906,8 @@ void Parallaction::doLocationEnterTransition() {
_gfx->updateScreen();
}
+ _gfx->setPalette(_gfx->_palette);
+
debugC(2, kDebugExec, "doLocationEnterTransition completed");
return;
diff --git a/engines/parallaction/parallaction_ns.cpp b/engines/parallaction/parallaction_ns.cpp
index 4f2af806ef..162e9c46c7 100644
--- a/engines/parallaction/parallaction_ns.cpp
+++ b/engines/parallaction/parallaction_ns.cpp
@@ -376,20 +376,10 @@ void Parallaction_ns::changeLocation(char *location) {
_gfx->setBlackPalette();
_gfx->updateScreen();
- if (_location._commands.size() > 0) {
- runCommands(_location._commands);
- runJobs();
- _gfx->swapBuffers();
- runJobs();
- _gfx->swapBuffers();
- }
+ runCommands(_location._commands);
doLocationEnterTransition();
- runJobs();
- _gfx->swapBuffers();
-
- _gfx->setPalette(_gfx->_palette);
runCommands(_location._aCommands);
if (_hasLocationSound)