[Scummvm-cvs-logs] CVS: scummvm/saga module.mk,1.14,1.15 render.cpp,1.20,1.21 saga.cpp,1.31,1.32 saga.h,1.22,1.23 timer.cpp,1.4,NONE timer.h,1.2,NONE

[Jonathan Gray]

Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32261

Modified Files:
	module.mk render.cpp saga.cpp saga.h 
Removed Files:
	timer.cpp timer.h 
Log Message:
remove timer wrapper functions

Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/module.mk,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- module.mk	1 Aug 2004 09:15:12 -0000	1.14
+++ module.mk	2 Aug 2004 12:41:40 -0000	1.15
@@ -36,7 +36,6 @@
 	saga/transitions.o \
 	saga/ys_dl_list.o \
 	saga/input.o \
-	saga/timer.o \
 	saga/music.o \
 	saga/sound.o
 

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/render.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- render.cpp	1 Aug 2004 12:06:12 -0000	1.20
+++ render.cpp	2 Aug 2004 12:41:40 -0000	1.21
@@ -25,7 +25,6 @@
 #include "saga.h"
 
 #include "gfx.h"
-#include "timer.h"
 #include "actor_mod.h"
 #include "console_mod.h"
 #include "cvar_mod.h"
@@ -40,6 +39,7 @@
 #include "objectmap_mod.h"
 
 #include "render.h"
+#include <common/timer.h>
 
 namespace Saga {
 

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- saga.cpp	1 Aug 2004 22:48:40 -0000	1.31
+++ saga.cpp	2 Aug 2004 12:41:40 -0000	1.32
@@ -32,7 +32,6 @@
 
 #include "saga.h"
 
-#include "timer.h"
 #include "gfx.h"
 #include "rscfile_mod.h"
 #include "render.h"
@@ -170,10 +169,7 @@
 
 	// System initialization
 
-	// Must initialize system timer module first
-	if (SYSTIMER_InitMSCounter() != R_SUCCESS) {
-		return;
-	}
+	_previousTicks = _system->get_msecs();
 
 	// On some platforms, graphics initialization also initializes sound
 	// ( Win32 DirectX )... Music must be initialized before sound for 
@@ -212,18 +208,26 @@
 	_anim->reg();
 	_actionMap->reg();
 
-	SYSTIMER_ResetMSCounter();
+	_previousTicks = _system->get_msecs();
 
 	// Begin Main Engine Loop
 
 	SCENE_Start();
+	uint32 currentTicks;
 
 	for (;;) {
 		if (_render->getFlags() & RF_RENDERPAUSE) {
 			// Freeze time while paused
-			SYSTIMER_ResetMSCounter();
+			_previousTicks = _system->get_msecs();
 		} else {
-			msec = SYSTIMER_ReadMSCounter();
+			currentTicks = _system->get_msecs();
+			// Timer has rolled over after 49 days
+			if (currentTicks < _previousTicks)
+				msec = 0;
+			else {
+				msec = currentTicks - _previousTicks;
+				_previousTicks = currentTicks;
+			}
 			if (msec > R_MAX_TIME_DELTA) {
 				msec = R_MAX_TIME_DELTA;
 			}
@@ -233,7 +237,7 @@
 		}
 		// Per frame processing
 		_render->drawScene();
-		SYSTIMER_Sleep(0);
+		_system->delay_msecs(0);
 	}
 }
 

Index: saga.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- saga.h	1 Aug 2004 22:48:40 -0000	1.22
+++ saga.h	2 Aug 2004 12:41:40 -0000	1.23
@@ -102,6 +102,7 @@
 	int decodeBGImageRLE(const byte *inbuf, size_t inbuf_len, byte *outbuf, size_t outbuf_len);
 	int flipImage(byte *img_buf, int columns, int scanlines);
 	int unbankBGImage(byte *dest_buf, const byte *src_buf, int columns, int scanlines);
+	uint32 _previousTicks;
 
 public:
 	int decodeBGImage(const byte *image_data, size_t image_size,

--- timer.cpp DELETED ---

--- timer.h DELETED ---