[Scummvm-cvs-logs] CVS: scummvm/queen display.cpp,1.67,1.68 input.cpp,1.27,1.28 journal.cpp,1.37,1.38

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


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

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

Index: display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/display.cpp,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- display.cpp	6 Aug 2004 17:07:21 -0000	1.67
+++ display.cpp	28 Sep 2004 20:19:27 -0000	1.68
@@ -930,7 +930,7 @@
 }
 
 void Display::shake(bool reset) {
-	_system->set_shake_pos(reset ? 0 : 3);
+	_system->setShakePos(reset ? 0 : 3);
 }
 
 void Display::blankScreen() {

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/input.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- input.cpp	14 Aug 2004 22:33:13 -0000	1.27
+++ input.cpp	28 Sep 2004 20:19:27 -0000	1.28
@@ -74,7 +74,7 @@
 
 	OSystem::Event event;
 
-	uint32 start = _system->get_msecs();
+	uint32 start = _system->getMillis();
 	uint32 cur = start;
 
 	if (_idleTime < DELAY_SCREEN_BLANKER) {
@@ -82,7 +82,7 @@
 	}
 
 	do {
-		while (_system->poll_event(&event)) {
+		while (_system->pollEvent(event)) {
 			_idleTime = 0;
 			switch (event.event_code) {
 				case OSystem::EVENT_KEYDOWN:
@@ -131,8 +131,8 @@
 		uint this_delay = 20; // 1?
 		if (this_delay > amount)
 			this_delay = amount;
-		_system->delay_msecs(this_delay);
-		cur = _system->get_msecs();
+		_system->delayMillis(this_delay);
+		cur = _system->getMillis();
 	} while (cur < start + amount);
 }
 

Index: journal.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/journal.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- journal.cpp	26 Aug 2004 07:09:38 -0000	1.37
+++ journal.cpp	28 Sep 2004 20:19:27 -0000	1.38
@@ -62,7 +62,7 @@
 	OSystem *system = OSystem::instance();
 	while (!_quit) {
 		OSystem::Event event;
-		while (system->poll_event(&event)) {
+		while (system->pollEvent(event)) {
 			switch (event.event_code) {
 			case OSystem::EVENT_KEYDOWN:
 				handleKeyDown(event.kbd.ascii, event.kbd.keycode);
@@ -83,7 +83,7 @@
 				break;
 			}
 		}
-		system->delay_msecs(20);
+		system->delayMillis(20);
 		system->updateScreen();
 	}
 





More information about the Scummvm-git-logs mailing list