[Scummvm-cvs-logs] CVS: scummvm/saga input.cpp,1.12,1.13 saga.cpp,1.48,1.49

Max Horn fingolfin at users.sourceforge.net
Tue Sep 28 13:27:33 CEST 2004


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

Modified Files:
	input.cpp saga.cpp 
Log Message:
Rename remaining OSystem methods to match our coding guidelines

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/input.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- input.cpp	12 Aug 2004 23:57:45 -0000	1.12
+++ input.cpp	28 Sep 2004 20:19:27 -0000	1.13
@@ -37,7 +37,7 @@
 
 	R_POINT imouse_pt;
 
-	while (g_system->poll_event(&event)) {
+	while (g_system->pollEvent(event)) {
 		int in_char;
 
 		switch (event.event_code) {

Index: saga.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/saga.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- saga.cpp	27 Aug 2004 01:32:10 -0000	1.48
+++ saga.cpp	28 Sep 2004 20:19:27 -0000	1.49
@@ -153,7 +153,7 @@
 
 	// System initialization
 
-	_previousTicks = _system->get_msecs();
+	_previousTicks = _system->getMillis();
 
 	// On some platforms, graphics initialization also initializes sound
 	// ( Win32 DirectX )... Music must be initialized before sound for 
@@ -202,7 +202,7 @@
 	_actionMap->reg();
 	_objectMap->reg();
 
-	_previousTicks = _system->get_msecs();
+	_previousTicks = _system->getMillis();
 
 	// Begin Main Engine Loop
 
@@ -212,9 +212,9 @@
 	for (;;) {
 		if (_render->getFlags() & RF_RENDERPAUSE) {
 			// Freeze time while paused
-			_previousTicks = _system->get_msecs();
+			_previousTicks = _system->getMillis();
 		} else {
-			currentTicks = _system->get_msecs();
+			currentTicks = _system->getMillis();
 			// Timer has rolled over after 49 days
 			if (currentTicks < _previousTicks)
 				msec = 0;
@@ -231,7 +231,7 @@
 		}
 		// Per frame processing
 		_render->drawScene();
-		_system->delay_msecs(10);
+		_system->delayMillis(10);
 	}
 }
 





More information about the Scummvm-git-logs mailing list