[Scummvm-cvs-logs] SF.net SVN: scummvm:[38749] scummvm/trunk/engines/sci/gfx/operations.cpp

[dhewg at users.sourceforge.net]

Revision: 38749
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38749&view=rev
Author:   dhewg
Date:     2009-02-21 22:00:24 +0000 (Sat, 21 Feb 2009)

Log Message:
-----------
substituted some more sci_gettime

Modified Paths:
--------------
    scummvm/trunk/engines/sci/gfx/operations.cpp

Modified: scummvm/trunk/engines/sci/gfx/operations.cpp
===================================================================
--- scummvm/trunk/engines/sci/gfx/operations.cpp	2009-02-21 21:22:50 UTC (rev 38748)
+++ scummvm/trunk/engines/sci/gfx/operations.cpp	2009-02-21 22:00:24 UTC (rev 38749)
@@ -28,6 +28,8 @@
 #include "sci/include/sci_memory.h"
 #include "sci/gfx/gfx_operations.h"
 
+#include "common/system.h"
+
 #include <ctype.h>
 
 namespace Sci {
@@ -1365,24 +1367,17 @@
 }
 
 int gfxop_usleep(gfx_state_t *state, long usecs) {
-	long time, utime;
-	long wakeup_time, wakeup_utime;
-	long add_seconds;
+	uint32 time, wakeup_time;
 	int retval = GFX_OK;
 
 	BASIC_CHECKS(GFX_FATAL);
 
-	sci_gettime(&wakeup_time, &wakeup_utime);
-	wakeup_utime += usecs;
+	wakeup_time = g_system->getMillis() + usecs / 1000;
 
-	add_seconds = (wakeup_utime / MILLION);
-	wakeup_time += add_seconds;
-	wakeup_utime -= (MILLION * add_seconds);
-
 	do {
 		GFXOP_FULL_POINTER_REFRESH;
-		sci_gettime(&time, &utime);
-		usecs = (wakeup_time - time) * MILLION + wakeup_utime - utime;
+		time = g_system->getMillis();
+		usecs = 1000l * (wakeup_time - time);
 	} while ((usecs > 0) && !(retval = state->driver->usec_sleep(state->driver, usecs)));
 
 	if (retval) {
@@ -1392,7 +1387,6 @@
 	return retval;
 }
 
-
 int _gfxop_set_pointer(gfx_state_t *state, gfx_pixmap_t *pxm) {
 	rect_t old_pointer_bounds = {0, 0, 0, 0};
 	rect_t pointer_bounds = {0, 0, 0, 0};


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