[Scummvm-cvs-logs] CVS: scummvm/sky control.cpp,1.76,1.77 intro.cpp,1.48,1.49 mouse.cpp,1.34,1.35 screen.cpp,1.59,1.60 sky.cpp,1.150,1.151

[Max Horn]

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

Modified Files:
	control.cpp intro.cpp mouse.cpp screen.cpp sky.cpp 
Log Message:
Rename remaining OSystem methods to match our coding guidelines

Index: control.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/control.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- control.cpp	18 Sep 2004 11:34:55 -0000	1.76
+++ control.cpp	28 Sep 2004 20:19:31 -0000	1.77
@@ -1679,12 +1679,12 @@
 
 	OSystem::Event event;
 
-	uint32 start = _system->get_msecs();
+	uint32 start = _system->getMillis();
 	uint32 cur = start;
 	_keyPressed = 0;	//reset
 
 	do {
-		while (_system->poll_event(&event)) {
+		while (_system->pollEvent(event)) {
 			switch (event.event_code) {
 			case OSystem::EVENT_KEYDOWN:
 				// Make sure backspace works right (this fixes a small issue on OS X)
@@ -1721,9 +1721,9 @@
 		if (this_delay > amount)
 			this_delay = amount;
 
-		if (this_delay > 0)	_system->delay_msecs(this_delay);
+		if (this_delay > 0)	_system->delayMillis(this_delay);
 
-		cur = _system->get_msecs();
+		cur = _system->getMillis();
 	} while (cur < start + amount);
 }
 

Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- intro.cpp	28 Mar 2004 16:30:49 -0000	1.48
+++ intro.cpp	28 Sep 2004 20:19:32 -0000	1.49
@@ -892,10 +892,10 @@
 	OSystem::Event event;
 	do {
 #ifdef _WIN32_WCE
-		uint32 startTimeLoop = _system->get_msecs();
+		uint32 startTimeLoop = _system->getMillis();
 		uint32 delta;
 #endif
-		while (_system->poll_event(&event)) {
+		while (_system->pollEvent(event)) {
 			if (event.event_code == OSystem::EVENT_KEYDOWN) {
 				if (event.kbd.keycode == 27)
 					return false;
@@ -909,9 +909,9 @@
 #else
 		uint8 nDelay = (msecs > 50) ? (50) : ((uint8)msecs);
 #endif
-		_system->delay_msecs(nDelay);
+		_system->delayMillis(nDelay);
 #ifdef _WIN32_WCE
-		delta = _system->get_msecs() - startTimeLoop;
+		delta = _system->getMillis() - startTimeLoop;
 		if (delta > msecs)
 			break;
 		else

Index: mouse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/mouse.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- mouse.cpp	13 Sep 2004 17:05:23 -0000	1.34
+++ mouse.cpp	28 Sep 2004 20:19:32 -0000	1.35
@@ -167,8 +167,8 @@
 	bool mousePressed = true;
 	OSystem::Event event;
 	while (mousePressed) {
-		_system->delay_msecs(20);
-		while (_system->poll_event(&event)) {
+		_system->delayMillis(20);
+		while (_system->pollEvent(event)) {
 			if ((event.event_code == OSystem::EVENT_LBUTTONUP) ||
 				(event.event_code == OSystem::EVENT_QUIT))
 				mousePressed = false;

Index: screen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/screen.cpp,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- screen.cpp	28 Mar 2004 16:30:49 -0000	1.59
+++ screen.cpp	28 Sep 2004 20:19:32 -0000	1.60
@@ -249,7 +249,7 @@
 			palette_fadedown_helper((uint32 *)_palette, GAME_COLOURS);
 			_system->setPalette(_palette, 0, GAME_COLOURS);
 			_system->updateScreen();
-			_system->delay_msecs(20);
+			_system->delayMillis(20);
 		}
 	}
 }
@@ -297,7 +297,7 @@
 		}
 		_system->setPalette(_palette, 0, GAME_COLOURS);
 		_system->updateScreen();
-		_system->delay_msecs(20);
+		_system->delayMillis(20);
 	}	
 }
 
@@ -368,8 +368,8 @@
 	while (!_gotTick) {
 		OSystem::Event event;
 
-		_system->delay_msecs(10);
-		while (_system->poll_event(&event));
+		_system->delayMillis(10);
+		while (_system->pollEvent(event));
 	}
 }
 
@@ -377,8 +377,8 @@
 	while (_seqInfo.running) {
 		OSystem::Event event;
 
-		_system->delay_msecs(20);
-		while (_system->poll_event(&event));
+		_system->delayMillis(20);
+		while (_system->pollEvent(event));
 	}
 }
 

Index: sky.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/sky.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -d -r1.150 -r1.151
--- sky.cpp	15 Sep 2004 15:31:39 -0000	1.150
+++ sky.cpp	28 Sep 2004 20:19:32 -0000	1.151
@@ -218,7 +218,7 @@
 	if (introSkipped)
 		_skyControl->restartGame();
 	
-	_lastSaveTime = _system->get_msecs();
+	_lastSaveTime = _system->getMillis();
 
 	while (1) {
 		if (_debugger->isAttached()) {
@@ -232,9 +232,9 @@
 		else
 			delay(_systemVars.gameSpeed);
 
-		if (_system->get_msecs() - _lastSaveTime > 5 * 60 * 1000) {
+		if (_system->getMillis() - _lastSaveTime > 5 * 60 * 1000) {
 			if (_skyControl->loadSaveAllowed()) {
-				_lastSaveTime = _system->get_msecs();
+				_lastSaveTime = _system->getMillis();
 				_skyControl->doAutoSave();
 			} else
 				_lastSaveTime += 30 * 1000; // try again in 30 secs
@@ -442,12 +442,12 @@
 
 	OSystem::Event event;
 
-	uint32 start = _system->get_msecs();
+	uint32 start = _system->getMillis();
 	uint32 cur = start;
 	_key_pressed = 0;	//reset
 
 	do {
-		while (_system->poll_event(&event)) {
+		while (_system->pollEvent(event)) {
 			switch (event.event_code) {
 			case OSystem::EVENT_KEYDOWN:
 				if (event.kbd.flags == OSystem::KBD_CTRL) {
@@ -501,9 +501,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);
 }