[Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.26,1.27 control.cpp,1.36,1.37 sword1.cpp,1.51,1.52

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


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

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

Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/animation.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- animation.cpp	11 Jul 2004 04:41:48 -0000	1.26
+++ animation.cpp	28 Sep 2004 20:19:34 -0000	1.27
@@ -73,7 +73,7 @@
 			_sys->updateScreen();
 #endif
 			OSystem::Event event;
-			while (_sys->poll_event(&event)) {
+			while (_sys->pollEvent(event)) {
 				switch (event.event_code) {
 #ifndef BACKEND_8BIT
 				case OSystem::EVENT_SCREEN_CHANGED:

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/control.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- control.cpp	18 Jul 2004 17:47:19 -0000	1.36
+++ control.cpp	28 Sep 2004 20:19:34 -0000	1.37
@@ -987,12 +987,12 @@
 void Control::delay(uint32 msecs) {
 	OSystem::Event event;
 
-	uint32 endTime = _system->get_msecs() + msecs;
+	uint32 endTime = _system->getMillis() + msecs;
 	_keyPressed = 0;	//reset
 	_mouseState = 0;
 
 	do {
-		while (_system->poll_event(&event)) {
+		while (_system->pollEvent(event)) {
 			switch (event.event_code) {
 			case OSystem::EVENT_KEYDOWN:
 
@@ -1033,8 +1033,8 @@
 				break;
 			}
 		}
-		_system->delay_msecs(10);
-	} while (_system->get_msecs() < endTime);
+		_system->delayMillis(10);
+	} while (_system->getMillis() < endTime);
 }
 
 const ButtonInfo Control::_deathButtons[3] = {

Index: sword1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword1/sword1.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- sword1.cpp	31 Aug 2004 07:52:47 -0000	1.51
+++ sword1.cpp	28 Sep 2004 20:19:34 -0000	1.52
@@ -1174,7 +1174,7 @@
 			uint32 newTime;
 			bool scrollFrameShown = false;
 
-			uint32 frameTime = _system->get_msecs();
+			uint32 frameTime = _system->getMillis();
 			_logic->engine();
 			_logic->updateScreenParams(); // sets scrolling
 
@@ -1185,19 +1185,19 @@
 			_menu->refresh(MENU_TOP);
 			_menu->refresh(MENU_BOT);
 
-			newTime = _system->get_msecs();
+			newTime = _system->getMillis();
 			if (newTime - frameTime < 1000 / FRAME_RATE) {
 				scrollFrameShown = _screen->showScrollFrame();
-				int32 restDelay = (1000 / (FRAME_RATE * 2)) - (_system->get_msecs() - frameTime);
+				int32 restDelay = (1000 / (FRAME_RATE * 2)) - (_system->getMillis() - frameTime);
 				if (restDelay > 0)
 					delay((uint)restDelay);
 			}
 
-			newTime = _system->get_msecs();
+			newTime = _system->getMillis();
 			if ((newTime - frameTime < 1000 / FRAME_RATE) || (!scrollFrameShown))
 				_screen->updateScreen();
 
-			int32 frameDelay = (1000 / FRAME_RATE) - (_system->get_msecs() - frameTime);
+			int32 frameDelay = (1000 / FRAME_RATE) - (_system->getMillis() - frameTime);
 			if (frameDelay > 0)
 				delay((uint)frameDelay);
 			else
@@ -1240,11 +1240,11 @@
 
 	OSystem::Event event;
 
-	uint32 start = _system->get_msecs();
+	uint32 start = _system->getMillis();
 	uint32 cur = start;
 
 	do {
-		while (_system->poll_event(&event)) {
+		while (_system->pollEvent(event)) {
 			switch (event.event_code) {
 			case OSystem::EVENT_KEYDOWN:
 
@@ -1296,9 +1296,9 @@
 #endif
 			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