[Scummvm-cvs-logs] SF.net SVN: scummvm: [29558] scummvm/trunk/engines/parallaction

[peres001 at users.sourceforge.net]

Revision: 29558
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29558&view=rev
Author:   peres001
Date:     2007-11-18 10:04:41 -0800 (Sun, 18 Nov 2007)

Log Message:
-----------
Removed other paranoia code from the original engine (as in revision 29505).

Revision Links:
--------------
    http://scummvm.svn.sourceforge.net/scummvm/?rev=29505&view=rev

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/parallaction.cpp
    scummvm/trunk/engines/parallaction/parallaction_ns.cpp

Modified: scummvm/trunk/engines/parallaction/parallaction.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.cpp	2007-11-18 17:58:53 UTC (rev 29557)
+++ scummvm/trunk/engines/parallaction/parallaction.cpp	2007-11-18 18:04:41 UTC (rev 29558)
@@ -906,6 +906,8 @@
 		_gfx->updateScreen();
 	}
 
+	_gfx->setPalette(_gfx->_palette);
+
 	debugC(2, kDebugExec, "doLocationEnterTransition completed");
 
 	return;

Modified: scummvm/trunk/engines/parallaction/parallaction_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-11-18 17:58:53 UTC (rev 29557)
+++ scummvm/trunk/engines/parallaction/parallaction_ns.cpp	2007-11-18 18:04:41 UTC (rev 29558)
@@ -376,20 +376,10 @@
 	_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)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.