From ce8c99bf62838099142aa79f2935e64639aa5571 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 28 Sep 2004 20:19:37 +0000
Subject: Rename remaining OSystem methods to match our coding guidelines

svn-id: r15332
---
 sword1/animation.cpp |  2 +-
 sword1/control.cpp   |  8 ++++----
 sword1/sword1.cpp    | 18 +++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

(limited to 'sword1')

diff --git a/sword1/animation.cpp b/sword1/animation.cpp
index 6dee00941a..0e4531bdd6 100644
--- a/sword1/animation.cpp
+++ b/sword1/animation.cpp
@@ -73,7 +73,7 @@ void MoviePlayer::play(const char *filename) {
 			_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:
diff --git a/sword1/control.cpp b/sword1/control.cpp
index d04e6abc47..5b427f4956 100644
--- a/sword1/control.cpp
+++ b/sword1/control.cpp
@@ -987,12 +987,12 @@ void Control::doRestore(void) {
 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 @@ void Control::delay(uint32 msecs) {
 				break;
 			}
 		}
-		_system->delay_msecs(10);
-	} while (_system->get_msecs() < endTime);
+		_system->delayMillis(10);
+	} while (_system->getMillis() < endTime);
 }
 
 const ButtonInfo Control::_deathButtons[3] = {
diff --git a/sword1/sword1.cpp b/sword1/sword1.cpp
index 659c4177e8..80f1e71e92 100644
--- a/sword1/sword1.cpp
+++ b/sword1/sword1.cpp
@@ -1174,7 +1174,7 @@ uint8 SwordEngine::mainLoop(void) {
 			uint32 newTime;
 			bool scrollFrameShown = false;
 
-			uint32 frameTime = _system->get_msecs();
+			uint32 frameTime = _system->getMillis();
 			_logic->engine();
 			_logic->updateScreenParams(); // sets scrolling
 
@@ -1185,19 +1185,19 @@ uint8 SwordEngine::mainLoop(void) {
 			_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 @@ void SwordEngine::delay(uint amount) { //copied and mutilated from sky.cpp
 
 	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 @@ void SwordEngine::delay(uint amount) { //copied and mutilated from sky.cpp
 #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);
 }
 
-- 
cgit v1.2.3