[Scummvm-cvs-logs] CVS: scummvm/simon simon.cpp,1.453,1.454

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


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

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

Index: simon.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/simon.cpp,v
retrieving revision 1.453
retrieving revision 1.454
diff -u -d -r1.453 -r1.454
--- simon.cpp	21 Aug 2004 09:51:01 -0000	1.453
+++ simon.cpp	28 Sep 2004 20:19:31 -0000	1.454
@@ -4791,7 +4791,7 @@
 void SimonEngine::delay(uint amount) {
 	OSystem::Event event;
 
-	uint32 start = _system->get_msecs();
+	uint32 start = _system->getMillis();
 	uint32 cur = start;
 	uint this_delay, vga_period;
 
@@ -4820,7 +4820,7 @@
 			_in_callback = false;
 		}
 
-		while (_system->poll_event(&event)) {
+		while (_system->pollEvent(event)) {
 			switch (event.event_code) {
 			case OSystem::EVENT_KEYDOWN:
 				if (event.kbd.keycode >= '0' && event.kbd.keycode <='9'
@@ -4888,9 +4888,9 @@
 			this_delay = _fast_mode ? 1 : 20 * _speed;
 			if (this_delay > amount)
 				this_delay = amount;
-			_system->delay_msecs(this_delay);
+			_system->delayMillis(this_delay);
 		}
-		cur = _system->get_msecs();
+		cur = _system->getMillis();
 	} while (cur < start + amount);
 }
 





More information about the Scummvm-git-logs mailing list