From 9e58b0253d40efb2513755e7f09b17e12fdecdc8 Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo <peres@scummvm.org>
Date: Sun, 18 Nov 2007 18:04:41 +0000
Subject: [PATCH] Removed other paranoia code from the original engine (as in
 revision 29505).

svn-id: r29558
---
 engines/parallaction/parallaction.cpp    |  2 ++
 engines/parallaction/parallaction_ns.cpp | 12 +-----------
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index 54bf992dcd1..169d8198ca7 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 4f2af806ef7..162e9c46c76 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)