[Scummvm-cvs-logs] CVS: scummvm/sword2/driver driver96.h,1.58,1.59 menu.cpp,1.21,1.22 misc.cpp,1.14,1.15 palette.cpp,1.24,1.25 render.cpp,1.41,1.42

Torbj?rn Andersson eriktorbjorn at users.sourceforge.net
Tue Nov 11 02:31:05 CET 2003


Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1:/tmp/cvs-serv25104/driver

Modified Files:
	driver96.h menu.cpp misc.cpp palette.cpp render.cpp 
Log Message:
Removed SVM_timeGetTime(). We may as well call get_msecs() directly.


Index: driver96.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/driver96.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- driver96.h	11 Nov 2003 07:43:02 -0000	1.58
+++ driver96.h	11 Nov 2003 10:30:22 -0000	1.59
@@ -276,7 +276,6 @@
 //-----------------------------------------------------------------------------
 //	Misc functions - from misc.cpp
 //-----------------------------------------------------------------------------
-extern uint32 SVM_timeGetTime(void);
 extern void SVM_SetFileAttributes(char *file, uint32 atrib);
 extern void SVM_DeleteFile(char *file);
 extern int32 SVM_GetVolumeInformation(char *cdPath, char *sCDName, uint32 maxPath, uint8 *, uint32 *dwMaxCompLength, uint32 *dwFSFlags, uint8 *, uint32 a);

Index: menu.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/menu.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- menu.cpp	11 Nov 2003 07:43:02 -0000	1.21
+++ menu.cpp	11 Nov 2003 10:30:24 -0000	1.22
@@ -65,10 +65,10 @@
 	static int32 lastTime = 0;
 
 	if (lastTime == 0) {
-		lastTime = SVM_timeGetTime();
+		lastTime = g_system->get_msecs();
 		frameCount = 1;
 	} else {
-		delta = SVM_timeGetTime() - lastTime;
+		delta = g_system->get_msecs() - lastTime;
 		if (delta > 250) {
 			lastTime += delta;
 			delta = 250;

Index: misc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/misc.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- misc.cpp	28 Oct 2003 19:51:30 -0000	1.14
+++ misc.cpp	11 Nov 2003 10:30:25 -0000	1.15
@@ -23,10 +23,6 @@
 
 namespace Sword2 {
 
-uint32 SVM_timeGetTime(void) {
-	return g_system->get_msecs();
-}
-
 void SVM_SetFileAttributes(char *file, uint32 atrib) {
 	warning("stub SetFileAttributes");
 }

Index: palette.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/palette.cpp,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- palette.cpp	11 Nov 2003 07:43:02 -0000	1.24
+++ palette.cpp	11 Nov 2003 10:30:25 -0000	1.25
@@ -141,7 +141,7 @@
 
 	_fadeTotalTime = (int32) (time * 1000);
 	_fadeStatus = RDFADE_UP;
-	_fadeStartTime = SVM_timeGetTime();
+	_fadeStartTime = g_system->get_msecs();
 
 	return RD_OK;
 }
@@ -157,7 +157,7 @@
 
 	_fadeTotalTime = (int32) (time * 1000);
 	_fadeStatus = RDFADE_DOWN;
-	_fadeStartTime = SVM_timeGetTime();
+	_fadeStartTime = g_system->get_msecs();
 
 	return RD_OK;
 }
@@ -196,7 +196,7 @@
 
 	// I don't know if this is necessary, but let's limit how often the
 	// palette is updated, just to be safe.
-	currentTime = SVM_timeGetTime();
+	currentTime = g_system->get_msecs();
 	if (currentTime - previousTime <= 25)
 		return;
 

Index: render.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/render.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- render.cpp	11 Nov 2003 07:43:02 -0000	1.41
+++ render.cpp	11 Nov 2003 10:30:25 -0000	1.42
@@ -575,7 +575,7 @@
  */
 
 void Graphics::initialiseRenderCycle(void) {
-	_initialTime = SVM_timeGetTime();
+	_initialTime = g_system->get_msecs();
 	_totalTime = _initialTime + MILLISECSPERCYCLE;
 }
 
@@ -588,7 +588,7 @@
 	_scrollXOld = _scrollX;
 	_scrollYOld = _scrollY;
 
-	_startTime = SVM_timeGetTime();
+	_startTime = g_system->get_msecs();
 
 	if (_startTime + _renderAverageTime >= _totalTime)	{
 		_scrollX = _scrollXTarget;
@@ -614,7 +614,7 @@
 	static int32 renderCountIndex = 0;
 	int32 time;
 
-	time = SVM_timeGetTime();
+	time = g_system->get_msecs();
 	renderTimeLog[renderCountIndex] = time - _startTime;
 	_startTime = time;
 	_renderAverageTime = (renderTimeLog[0] + renderTimeLog[1] + renderTimeLog[2] + renderTimeLog[3]) >> 2;
@@ -640,7 +640,7 @@
 		// If we have already reached the scroll target sleep for the
 		// rest of the render cycle.
 		g_sword2->sleepUntil(_totalTime);
-		_initialTime = SVM_timeGetTime();
+		_initialTime = g_system->get_msecs();
 		_totalTime += MILLISECSPERCYCLE;
 		return true;
 	}





More information about the Scummvm-git-logs mailing list