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

[peres001 at users.sourceforge.net]

Revision: 28061
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28061&view=rev
Author:   peres001
Date:     2007-07-13 13:50:57 -0700 (Fri, 13 Jul 2007)

Log Message:
-----------
Full screen updates aren't automatic after palette changes anymore now. Traded some code pollution with SPEED!

Modified Paths:
--------------
    scummvm/trunk/engines/parallaction/callables.cpp
    scummvm/trunk/engines/parallaction/graphics.cpp
    scummvm/trunk/engines/parallaction/location.cpp
    scummvm/trunk/engines/parallaction/menu.cpp
    scummvm/trunk/engines/parallaction/parallaction.h

Modified: scummvm/trunk/engines/parallaction/callables.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/callables.cpp	2007-07-13 17:00:31 UTC (rev 28060)
+++ scummvm/trunk/engines/parallaction/callables.cpp	2007-07-13 20:50:57 UTC (rev 28061)
@@ -78,7 +78,8 @@
 		_vm->_gfx->fadePalette(pal);
 		_vm->_gfx->setPalette(pal);
 
-		_vm->waitTime( 1 );
+		g_system->delayMillis(20);
+		_vm->_gfx->updateScreen();
 	}
 
 	return;
@@ -292,6 +293,9 @@
 		}
 
 		_vm->_gfx->setPalette(_enginePal);
+		g_system->delayMillis(20);
+		_vm->_gfx->updateScreen();
+
 	}
 
 	waitUntilLeftClick();
@@ -316,11 +320,14 @@
 	for (uint16 _di = 0; _di < 30; _di++) {
 		g_system->delayMillis(20);
 		_vm->_gfx->setPalette(pal0, FIRST_BASE_COLOR, BASE_PALETTE_COLORS);
+		_vm->_gfx->updateScreen();
 		g_system->delayMillis(20);
 		_vm->_gfx->setPalette(pal1, FIRST_BASE_COLOR, BASE_PALETTE_COLORS);
+		_vm->_gfx->updateScreen();
 	}
 
 	_vm->_gfx->setPalette(_vm->_gfx->_palette);
+	_vm->_gfx->updateScreen();
 
 	return;
 }

Modified: scummvm/trunk/engines/parallaction/graphics.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/graphics.cpp	2007-07-13 17:00:31 UTC (rev 28060)
+++ scummvm/trunk/engines/parallaction/graphics.cpp	2007-07-13 20:50:57 UTC (rev 28061)
@@ -30,9 +30,6 @@
 #include "parallaction/parallaction.h"
 
 
-
-extern OSystem *g_system;
-
 namespace Parallaction {
 
 byte *		Gfx::_buffers[];
@@ -142,7 +139,7 @@
 	if (_vm->getPlatform() == Common::kPlatformAmiga)
 		g_system->setPalette(sysExtraPal, first+FIRST_EHB_COLOR, num);
 
-	g_system->updateScreen();
+//	g_system->updateScreen();
 
 	return;
 }

Modified: scummvm/trunk/engines/parallaction/location.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/location.cpp	2007-07-13 17:00:31 UTC (rev 28060)
+++ scummvm/trunk/engines/parallaction/location.cpp	2007-07-13 20:50:57 UTC (rev 28061)
@@ -25,6 +25,8 @@
 
 #include "common/stdafx.h"
 
+#include "common/system.h"
+
 #include "parallaction/parallaction.h"
 #include "parallaction/sound.h"
 
@@ -249,7 +251,9 @@
 			_si += 3;
 		}
 
+		g_system->delayMillis(20);
 		_gfx->setPalette(pal);
+		_gfx->updateScreen();
 	}
 
 	_disk->loadScenery(background, mask);
@@ -371,6 +375,7 @@
 	_gfx->copyScreen(Gfx::kBitBack, Gfx::kBitFront);
 	_gfx->copyScreen(Gfx::kBitBack, Gfx::kBit2);
 	_gfx->setBlackPalette();
+	_gfx->updateScreen();
 
 	if (_location._commands.size() > 0) {
 		runCommands(_location._commands);
@@ -450,6 +455,7 @@
 		_gfx->quickFadePalette(pal);
 		_gfx->setPalette(pal);
 		waitTime( 1 );
+		_gfx->updateScreen();
 	}
 
 	debugC(1, kDebugLocation, "doLocationEnterTransition completed");

Modified: scummvm/trunk/engines/parallaction/menu.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/menu.cpp	2007-07-13 17:00:31 UTC (rev 28060)
+++ scummvm/trunk/engines/parallaction/menu.cpp	2007-07-13 20:50:57 UTC (rev 28061)
@@ -435,6 +435,7 @@
 	}
 
 	_vm->_gfx->setBlackPalette();
+	_vm->_gfx->updateScreen();
 
 	_engineFlags |= kEngineChangeLocation;
 

Modified: scummvm/trunk/engines/parallaction/parallaction.h
===================================================================
--- scummvm/trunk/engines/parallaction/parallaction.h	2007-07-13 17:00:31 UTC (rev 28060)
+++ scummvm/trunk/engines/parallaction/parallaction.h	2007-07-13 20:50:57 UTC (rev 28061)
@@ -43,6 +43,7 @@
 	class CommandSender;
 }
 
+extern OSystem *g_system;
 
 namespace Parallaction {
 


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