[Scummvm-cvs-logs] SF.net SVN: scummvm:[43535] scummvm/trunk/engines/kyra/script_mr.cpp

[lordhoto at users.sourceforge.net]

Revision: 43535
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43535&view=rev
Author:   lordhoto
Date:     2009-08-19 08:55:04 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
Cleanup.

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/script_mr.cpp

Modified: scummvm/trunk/engines/kyra/script_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_mr.cpp	2009-08-19 08:54:41 UTC (rev 43534)
+++ scummvm/trunk/engines/kyra/script_mr.cpp	2009-08-19 08:55:04 UTC (rev 43535)
@@ -266,7 +266,7 @@
 		for (int curY = y, height = 20; height > 0; height -= 2, curY += 2) {
 			restoreGfxRect32x32(x, y);
 			_screen->setNewShapeHeight(shape, height);
-			uint32 waitTime = _system->getMillis() + _tickLength;
+			const uint32 waitTime = _system->getMillis() + _tickLength;
 			_screen->drawShape(0, shape, x, curY, 0, 0);
 			_screen->updateScreen();
 			delayUntil(waitTime);
@@ -1131,15 +1131,7 @@
 
 int KyraEngine_MR::o3d_delay(EMCState *script) {
 	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3d_delay(%p) (%d)", (const void *)script, stackPos(0));
-	const uint32 endTime = _system->getMillis() + stackPos(0) * _tickLength;
-	while (_system->getMillis() < endTime) {
-		if (_chatText)
-			updateWithText();
-		else
-			update();
-
-		_system->delayMillis(10);
-	}
+	delayUntil(_system->getMillis() + stackPos(0) * _tickLength, false, true);
 	return 0;
 }
 


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