[Scummvm-cvs-logs] SF.net SVN: scummvm:[49853] scummvm/trunk/engines/sci/graphics

[m_kiewitz at users.sourceforge.net]

Revision: 49853
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49853&view=rev
Author:   m_kiewitz
Date:     2010-06-15 13:14:23 +0000 (Tue, 15 Jun 2010)

Log Message:
-----------
SCI: calling wait() directly and removing it from SciGui

Modified Paths:
--------------
    scummvm/trunk/engines/sci/graphics/gui.cpp
    scummvm/trunk/engines/sci/graphics/gui.h
    scummvm/trunk/engines/sci/graphics/paint16.cpp
    scummvm/trunk/engines/sci/graphics/portrait.cpp
    scummvm/trunk/engines/sci/graphics/transitions.cpp

Modified: scummvm/trunk/engines/sci/graphics/gui.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.cpp	2010-06-15 13:10:00 UTC (rev 49852)
+++ scummvm/trunk/engines/sci/graphics/gui.cpp	2010-06-15 13:14:23 UTC (rev 49853)
@@ -91,8 +91,4 @@
 	_paint16->init(_animate, _text16);
 }
 
-void SciGui::wait(int16 ticks) {
-	_s->wait(ticks);
-}
-
 } // End of namespace Sci

Modified: scummvm/trunk/engines/sci/graphics/gui.h
===================================================================
--- scummvm/trunk/engines/sci/graphics/gui.h	2010-06-15 13:10:00 UTC (rev 49852)
+++ scummvm/trunk/engines/sci/graphics/gui.h	2010-06-15 13:14:23 UTC (rev 49853)
@@ -51,8 +51,6 @@
 
 	virtual void init(bool usesOldGfxFunctions);
 
-	virtual void wait(int16 ticks);
-
 protected:
 	GfxCursor *_cursor;
 	EngineState *_s;

Modified: scummvm/trunk/engines/sci/graphics/paint16.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/paint16.cpp	2010-06-15 13:10:00 UTC (rev 49852)
+++ scummvm/trunk/engines/sci/graphics/paint16.cpp	2010-06-15 13:14:23 UTC (rev 49853)
@@ -562,22 +562,14 @@
 		if (directions & SCI_SHAKE_DIRECTION_VERTICAL)
 			_screen->setVerticalShakePos(10);
 		// TODO: horizontal shakes
+		g_system->updateScreen();
+		g_sci->getEngineState()->wait(3);
 
-		if (g_system->getMillis() - g_sci->getEngineState()->_screenUpdateTime >= 1000 / 60) {
-			g_system->updateScreen();
-			g_sci->getEngineState()->_screenUpdateTime = g_system->getMillis();
-		}
-
-		_gui->wait(3);
 		if (directions & SCI_SHAKE_DIRECTION_VERTICAL)
 			_screen->setVerticalShakePos(0);
 
-		if (g_system->getMillis() - g_sci->getEngineState()->_screenUpdateTime >= 1000 / 60) {
-			g_system->updateScreen();
-			g_sci->getEngineState()->_screenUpdateTime = g_system->getMillis();
-		}
-
-		_gui->wait(3);
+		g_system->updateScreen();
+		g_sci->getEngineState()->wait(3);
 	}
 }
 

Modified: scummvm/trunk/engines/sci/graphics/portrait.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/portrait.cpp	2010-06-15 13:10:00 UTC (rev 49852)
+++ scummvm/trunk/engines/sci/graphics/portrait.cpp	2010-06-15 13:14:23 UTC (rev 49853)
@@ -182,7 +182,7 @@
 
 		// Wait till syncTime passed, then show specific animation bitmap
 		do {
-			_gui->wait(1);
+			g_sci->getEngineState()->wait(1);
 			curEvent = _event->get(SCI_EVENT_ANY);
 			if (curEvent.type == SCI_EVENT_MOUSE_PRESS ||
 				(curEvent.type == SCI_EVENT_KEYBOARD && curEvent.data == SCI_KEY_ESC) ||

Modified: scummvm/trunk/engines/sci/graphics/transitions.cpp
===================================================================
--- scummvm/trunk/engines/sci/graphics/transitions.cpp	2010-06-15 13:10:00 UTC (rev 49852)
+++ scummvm/trunk/engines/sci/graphics/transitions.cpp	2010-06-15 13:14:23 UTC (rev 49853)
@@ -291,7 +291,7 @@
 			workPalette[colorNr * 4 + 2] = oldPalette[colorNr * 4 + 2] * stepNr / 100;
 		}
 		g_system->setPalette(workPalette + 4, 1, 254);
-		_gui->wait(2);
+		g_sci->getEngineState()->wait(2);
 	}
 }
 
@@ -301,7 +301,7 @@
 
 	for (stepNr = 0; stepNr <= 100; stepNr += 10) {
 		_palette->kernelSetIntensity(1, 255, stepNr, true);
-		_gui->wait(2);
+		g_sci->getEngineState()->wait(2);
 	}
 }
 


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