Rename remaining OSystem methods to match our coding guidelines

svn-id: r15332

8 files changed, 28 insertions, 28 deletions

diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 82ab0ad71c..f4bbe69e2c 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -393,10 +393,10 @@ void ScummEngine::drawDirtyScreenParts() {
 	// Handle shaking
 	if (_shakeEnabled) {
 		_shakeFrame = (_shakeFrame + 1) % NUM_SHAKE_POSITIONS;
-		_system->set_shake_pos(shake_positions[_shakeFrame]);
+		_system->setShakePos(shake_positions[_shakeFrame]);
 	} else if (!_shakeEnabled &&_shakeFrame != 0) {
 		_shakeFrame = 0;
-		_system->set_shake_pos(0);
+		_system->setShakePos(0);
 	}
 }
 
@@ -971,7 +971,7 @@ void ScummEngine::setShake(int mode) {
 
 	_shakeEnabled = mode != 0;
 	_shakeFrame = 0;
-	_system->set_shake_pos(0);
+	_system->setShakePos(0);
 }
 
 #pragma mark -
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 69a2f127f2..00c96bb19d 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -1176,7 +1176,7 @@ void IMuseInternal::initMT32(MidiDriver *midi) {
 	// Reset the MT-32
 	memcpy(&buffer[0], "\x41\x10\x16\x12\x7f\x00\x00\x01\x00", 9);
 	midi->sysEx(buffer, 9);
-	g_system->delay_msecs (100);
+	g_system->delayMillis (100);
 
 	// Compute version string (truncated to 20 chars max.)
 	strcat(info, gScummVMVersion);
@@ -1193,18 +1193,18 @@ void IMuseInternal::initMT32(MidiDriver *midi) {
 		checksum -= buffer[i];
 	buffer[27] = checksum & 0x7F;
 	midi->sysEx(buffer, 28);
-	g_system->delay_msecs (500);
+	g_system->delayMillis (500);
 
 	// Setup master tune, reverb mode, reverb time, reverb level,
 	// channel mapping, partial reserve and master volume
 	memcpy(&buffer[4], "\x10\x00\x00\x40\x00\x04\x04\x04\x04\x04\x04\x04\x04\x04\x04\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x64\x77", 27);
 	midi->sysEx(buffer, 31);
-	g_system->delay_msecs (250);
+	g_system->delayMillis (250);
 
 	// Setup rythm part
 	memcpy(&buffer[4], "\x03\x01\x10\x40\x64\x07\x00\x4a\x64\x06\x00\x41\x64\x07\x00\x4b\x64\x08\x00\x45\x64\x06\x00\x44\x64\x0b\x00\x51\x64\x05\x00\x43\x64\x08\x00\x50\x64\x07\x00\x42\x64\x03\x00\x4c\x64\x07\x00\x44", 48);
 	midi->sysEx(buffer, 52);
-	g_system->delay_msecs (250);
+	g_system->delayMillis (250);
 }
 
 void IMuseInternal::init_queue() {
diff --git a/scumm/imuse_digi/dimuse_script.cpp b/scumm/imuse_digi/dimuse_script.cpp
index 2129b267e3..22a44ea8de 100644
--- a/scumm/imuse_digi/dimuse_script.cpp
+++ b/scumm/imuse_digi/dimuse_script.cpp
@@ -383,7 +383,7 @@ void IMuseDigital::stopAllSounds() {
 		if (!foundNotRemoved)
 			break;
 		flushTracks();
-		_vm->_system->delay_msecs(50);
+		_vm->_system->delayMillis(50);
 #if defined(_WIN32_WCE) || defined (__PALM_OS__)
 		_vm->parseEvents(); // timers are events, we need to consume them
 #endif
diff --git a/scumm/input.cpp b/scumm/input.cpp
index 7cde2903c2..b8b10b975f 100644
--- a/scumm/input.cpp
+++ b/scumm/input.cpp
@@ -40,7 +40,7 @@ enum MouseButtonStatus {
 void ScummEngine::parseEvents() {
 	OSystem::Event event;
 
-	while (_system->poll_event(&event)) {
+	while (_system->pollEvent(event)) {
 
 		switch(event.event_code) {
 		case OSystem::EVENT_KEYDOWN:
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index 7b77e5286c..df82e0e7b2 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -770,7 +770,7 @@ void ScummEngine_v72he::o72_getTimer() {
 
 	if (cmd == 10) {
 		checkRange(3, 1, timer, "o72_getTimer: Timer %d out of range(%d)");
-		int diff = _system->get_msecs() - _timers[timer];
+		int diff = _system->getMillis() - _timers[timer];
 		push(diff);
 	} else {
 		push(0);
@@ -783,7 +783,7 @@ void ScummEngine_v72he::o72_setTimer() {
 
 	if (cmd == 158) {
 		checkRange(3, 1, timer, "o72_setTimer: Timer %d out of range(%d)");
-		_timers[timer] = _system->get_msecs();
+		_timers[timer] = _system->getMillis();
 	} else {
 		error("TIMER command %d?", cmd);
 	}
diff --git a/scumm/scumm.cpp b/scumm/scumm.cpp
index 5578769dab..b1b13d2a3a 100644
--- a/scumm/scumm.cpp
+++ b/scumm/scumm.cpp
@@ -1272,7 +1272,7 @@ void ScummEngine::scummInit() {
 	for (i = 0; i < 512; i++)
 		_keyDownMap[i] = false;
 
-	_lastSaveTime = _system->get_msecs();
+	_lastSaveTime = _system->getMillis();
 }
 
 void ScummEngine_v2::scummInit() {
@@ -1382,16 +1382,16 @@ void ScummEngine::setupMusic(int midi) {
 
 void ScummEngine::mainRun() {
 	int delta = 0;
-	int diff = _system->get_msecs();
+	int diff = _system->getMillis();
 
 	while (!_quit) {
 
 		updatePalette();
 		_system->updateScreen();
 
-		diff -= _system->get_msecs();
+		diff -= _system->getMillis();
 		waitForTimer(delta * 15 + diff);
-		diff = _system->get_msecs();
+		diff = _system->getMillis();
 		delta = scummLoop(delta);
 
 		if (delta < 1)	// Ensure we don't get into a loop
@@ -1411,15 +1411,15 @@ void ScummEngine::waitForTimer(int msec_delay) {
 	else if (_fastMode & 1)
 		msec_delay = 10;
 
-	start_time = _system->get_msecs();
+	start_time = _system->getMillis();
 
 	while (!_quit) {
 		parseEvents();
 
 		_sound->updateCD(); // Loop CD Audio if needed
-		if (_system->get_msecs() >= start_time + msec_delay)
+		if (_system->getMillis() >= start_time + msec_delay)
 			break;
-		_system->delay_msecs(10);
+		_system->delayMillis(10);
 	}
 }
 
@@ -1511,7 +1511,7 @@ int ScummEngine::scummLoop(int delta) {
 	}
 
 	// Trigger autosave all 5 minutes.
-	if (!_saveLoadFlag && _system->get_msecs() > _lastSaveTime + 5 * 60 * 1000) {
+	if (!_saveLoadFlag && _system->getMillis() > _lastSaveTime + 5 * 60 * 1000) {
 		_saveLoadSlot = 0;
 		sprintf(_saveLoadName, "Autosave %d", _saveLoadSlot);
 		_saveLoadFlag = 1;
@@ -1562,7 +1562,7 @@ load_game:
 			clearClickedStatus();
 
 		_saveLoadFlag = 0;
-		_lastSaveTime = _system->get_msecs();
+		_lastSaveTime = _system->getMillis();
 	}
 
 	if (_completeScreenRedraw) {
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index e919859954..88323adaf0 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -833,7 +833,7 @@ void SmushPlayer::handleFrame(Chunk &b) {
 	_skipNext = false;
 
 	uint32 start_time, end_time;
-	start_time = _vm->_system->get_msecs();
+	start_time = _vm->_system->getMillis();
 
 	if (_insanity) {
 		_vm->_insane->procPreRendering();
@@ -898,7 +898,7 @@ void SmushPlayer::handleFrame(Chunk &b) {
 		_vm->_insane->procPostRendering(_dst, 0, 0, 0, _frame, _nbframes-1);
 	}
 
-	end_time = _vm->_system->get_msecs();
+	end_time = _vm->_system->getMillis();
 
 	updateScreen();
 	_smixer->handleFrame();
@@ -1074,10 +1074,10 @@ void SmushPlayer::updateScreen() {
 	png_destroy_write_struct(&png_ptr, &info_ptr);
 #endif
 
-	uint32 end_time, start_time = _vm->_system->get_msecs();
+	uint32 end_time, start_time = _vm->_system->getMillis();
 	_vm->_system->copyRectToScreen(_dst, _width, 0, 0, _width, _height);
 	_updateNeeded = true;
-	end_time = _vm->_system->get_msecs();
+	end_time = _vm->_system->getMillis();
 	debugC(DEBUG_SMUSH, "Smush stats: updateScreen( %03d )", end_time - start_time);
 }
 
@@ -1175,18 +1175,18 @@ void SmushPlayer::play(const char *filename, int32 offset, int32 startFrame) {
 			
 			uint32 end_time, start_time;
 			
-			start_time = _vm->_system->get_msecs();
+			start_time = _vm->_system->getMillis();
 			_vm->_system->updateScreen();
 			_updateNeeded = false;
 
-			end_time = _vm->_system->get_msecs();
+			end_time = _vm->_system->getMillis();
 
 			debugC(DEBUG_SMUSH, "Smush stats: BackendUpdateScreen( %03d )", end_time - start_time);
 
 		}
 		if (_vm->_smushVideoShouldFinish || _vm->_quit || _vm->_saveLoadFlag)
 			break;
-		_vm->_system->delay_msecs(10);
+		_vm->_system->delayMillis(10);
 	};
 
 	release();
diff --git a/scumm/sound.cpp b/scumm/sound.cpp
index bca0153dd8..96f01833fa 100644
--- a/scumm/sound.cpp
+++ b/scumm/sound.cpp
@@ -1150,7 +1150,7 @@ void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) {
 
 	// Start the timer after starting the track. Starting an MP3 track is
 	// almost instantaneous, but a CD player may take some time. Hopefully
-	// play_cdrom() will block during that delay.
+	// playCD() will block during that delay.
 	startCDTimer();
 }