Rename remaining OSystem methods to match our coding guidelines

svn-id: r15332

6 files changed, 25 insertions, 25 deletions

diff --git a/sky/control.cpp b/sky/control.cpp
index 11992a1114..e1909c079c 100644
--- a/sky/control.cpp
+++ b/sky/control.cpp
@@ -1679,12 +1679,12 @@ void Control::delay(unsigned int amount) {
 
 	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 @@ void Control::delay(unsigned int amount) {
 		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);
 }
 
diff --git a/sky/intro.cpp b/sky/intro.cpp
index 2850663755..e2e338d1bf 100644
--- a/sky/intro.cpp
+++ b/sky/intro.cpp
@@ -892,10 +892,10 @@ bool Intro::escDelay(uint32 msecs) {
 	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 @@ bool Intro::escDelay(uint32 msecs) {
 #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
diff --git a/sky/mouse.cpp b/sky/mouse.cpp
index 2bb23dd759..bc84bcc5b3 100644
--- a/sky/mouse.cpp
+++ b/sky/mouse.cpp
@@ -167,8 +167,8 @@ void Mouse::waitMouseNotPressed(void) {
 	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;
diff --git a/sky/music/mt32music.cpp b/sky/music/mt32music.cpp
index 7dd568a291..a9ed8b693a 100644
--- a/sky/music/mt32music.cpp
+++ b/sky/music/mt32music.cpp
@@ -113,7 +113,7 @@ bool MT32Music::processPatchSysEx(uint8 *sysExData) {
 		crc -= sysExBuf[cnt];
 	sysExBuf[14] = crc & 0x7F;					// crc
 	_midiDrv->sysEx(sysExBuf, 15);
-	g_system->delay_msecs (5);
+	g_system->delayMillis (5);
 	return true;
 }
 
@@ -160,7 +160,7 @@ void MT32Music::startDriver(void) {
 		sendBuf[len] = crc & 0x7F;
 		len++;
 		_midiDrv->sysEx(sendBuf, len);
-		g_system->delay_msecs (5);
+		g_system->delayMillis (5);
 	}
 
 	while (processPatchSysEx(sysExData))
diff --git a/sky/screen.cpp b/sky/screen.cpp
index 2623f21dbb..6863fb16e2 100644
--- a/sky/screen.cpp
+++ b/sky/screen.cpp
@@ -249,7 +249,7 @@ void Screen::fnFadeDown(uint32 scroll) {
 			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 @@ void Screen::paletteFadeUp(uint8 *pal) {
 		}
 		_system->setPalette(_palette, 0, GAME_COLOURS);
 		_system->updateScreen();
-		_system->delay_msecs(20);
+		_system->delayMillis(20);
 	}	
 }
 
@@ -368,8 +368,8 @@ void Screen::waitForTimer(void) {
 	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 @@ void Screen::waitForSequence(void) {
 	while (_seqInfo.running) {
 		OSystem::Event event;
 
-		_system->delay_msecs(20);
-		while (_system->poll_event(&event));
+		_system->delayMillis(20);
+		while (_system->pollEvent(event));
 	}
 }
 
diff --git a/sky/sky.cpp b/sky/sky.cpp
index 5c1199dca6..ca5d2f1ec4 100644
--- a/sky/sky.cpp
+++ b/sky/sky.cpp
@@ -218,7 +218,7 @@ void SkyEngine::go() {
 	if (introSkipped)
 		_skyControl->restartGame();
 	
-	_lastSaveTime = _system->get_msecs();
+	_lastSaveTime = _system->getMillis();
 
 	while (1) {
 		if (_debugger->isAttached()) {
@@ -232,9 +232,9 @@ void SkyEngine::go() {
 		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 @@ void SkyEngine::delay(uint amount) {
 
 	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 @@ void SkyEngine::delay(uint amount) {
 #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);
 }