[Scummvm-cvs-logs] CVS: scummvm/sword2 build_display.cpp,1.63,1.64 console.cpp,1.47,1.48 controls.cpp,1.72,1.73 debug.cpp,1.41,1.42 function.cpp,1.66,1.67 sword2.cpp,1.114,1.115

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


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

Modified Files:
	build_display.cpp console.cpp controls.cpp debug.cpp 
	function.cpp sword2.cpp 
Log Message:
Rename remaining OSystem methods to match our coding guidelines

Index: build_display.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/build_display.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- build_display.cpp	11 Jun 2004 06:38:45 -0000	1.63
+++ build_display.cpp	28 Sep 2004 20:19:34 -0000	1.64
@@ -102,10 +102,10 @@
 		_graphics->updateDisplay();
 
 		_frameCount++;
-		if (_system->get_msecs() > _cycleTime) {
+		if (_system->getMillis() > _cycleTime) {
 			_fps = _frameCount;
 			_frameCount = 0;
-			_cycleTime = _system->get_msecs() + 1000;
+			_cycleTime = _system->getMillis() + 1000;
 		}
 	} while (!_graphics->endRenderCycle());
 
@@ -173,7 +173,7 @@
 	_graphics->waitForFade();
 
 	if (time > 0) {
-		uint32 targetTime = _system->get_msecs() + (time * 1000);
+		uint32 targetTime = _system->getMillis() + (time * 1000);
 		sleepUntil(targetTime);
 	} else {
 		while (!_quit) {
@@ -185,7 +185,7 @@
 				break;
 
 			_graphics->updateDisplay();
-			_system->delay_msecs(50);
+			_system->delayMillis(50);
 		}
 	}
 

Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/console.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- console.cpp	8 Sep 2004 07:10:53 -0000	1.47
+++ console.cpp	28 Sep 2004 20:19:34 -0000	1.48
@@ -368,9 +368,9 @@
 
 bool Debugger::Cmd_TimeOn(int argc, const char **argv) {
 	if (argc == 2)
-		_startTime = _vm->_system->get_msecs() - atoi(argv[1]) * 1000;
+		_startTime = _vm->_system->getMillis() - atoi(argv[1]) * 1000;
 	else if (_startTime == 0)
-		_startTime = _vm->_system->get_msecs();
+		_startTime = _vm->_system->getMillis();
 	_displayTime = true;
 	DebugPrintf("Timer display on\n");
 	return true;

Index: controls.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/controls.cpp,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- controls.cpp	8 Sep 2004 07:10:54 -0000	1.72
+++ controls.cpp	28 Sep 2004 20:19:35 -0000	1.73
@@ -401,7 +401,7 @@
 		oldMouseX = newMouseX;
 		oldMouseY = newMouseY;
 
-		_gui->_vm->_system->delay_msecs(20);
+		_gui->_vm->_system->delayMillis(20);
 
 		if (_gui->_vm->_quit)
 			setResult(0);

Index: debug.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/debug.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- debug.cpp	9 May 2004 13:32:03 -0000	1.41
+++ debug.cpp	28 Sep 2004 20:19:35 -0000	1.42
@@ -112,7 +112,7 @@
 	// debug info at top of screen - enabled/disabled as one complete unit
 
 	if (_displayTime) {
-		int32 time = _vm->_system->get_msecs();
+		int32 time = _vm->_system->getMillis();
 
 		if ((time - _startTime) / 1000 >= 10000)
 			_startTime = time;

Index: function.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/function.cpp,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- function.cpp	4 Sep 2004 21:17:27 -0000	1.66
+++ function.cpp	28 Sep 2004 20:19:35 -0000	1.67
@@ -250,7 +250,7 @@
 	// the delay was meant to be. Probably doesn't matter much.
 
 	_vm->_graphics->updateDisplay();
-	_vm->_system->delay_msecs(250);
+	_vm->_system->delayMillis(250);
 	_vm->_graphics->setPalette(0, 1, black, RDPAL_INSTANT);
 #endif
 
@@ -607,7 +607,7 @@
 	bool abortCredits = false;
 
 	int scrollSteps = lineTop + CREDITS_FONT_HEIGHT;
-	uint32 musicStart = _vm->_system->get_msecs();
+	uint32 musicStart = _vm->_system->getMillis();
 
 	// Ideally the music should last just a tiny bit longer than the
 	// credits. Note that musicTimeRemaining() will return 0 if the music
@@ -712,7 +712,7 @@
 
 		while (_vm->_sound->musicTimeRemaining() && !_vm->_quit) {
 			_vm->_graphics->updateDisplay(false);
-			_vm->_system->delay_msecs(100);
+			_vm->_system->delayMillis(100);
 		}
 	}
 

Index: sword2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/sword2.cpp,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- sword2.cpp	8 Sep 2004 07:10:54 -0000	1.114
+++ sword2.cpp	28 Sep 2004 20:19:35 -0000	1.115
@@ -307,7 +307,7 @@
 void Sword2Engine::parseEvents(void) {
 	OSystem::Event event;
 	
-	while (_system->poll_event(&event)) {
+	while (_system->pollEvent(event)) {
 		switch (event.event_code) {
 		case OSystem::EVENT_KEYDOWN:
 			if (!(_eventFilter & RD_KEYDOWN)) {
@@ -576,12 +576,12 @@
 // FIXME: Move this to some better place?
 
 void Sword2Engine::sleepUntil(uint32 time) {
-	while (_system->get_msecs() < time) {
+	while (_system->getMillis() < time) {
 		// Make sure menu animations and fades don't suffer, but don't
 		// redraw the entire scene.
 		_graphics->processMenu();
 		_graphics->updateDisplay(false);
-		_system->delay_msecs(10);
+		_system->delayMillis(10);
 	}
 }
 





More information about the Scummvm-git-logs mailing list