renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend

svn-id: r13087

9 files changed, 23 insertions, 23 deletions

diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp
index fb2e567c0d..3966683602 100644
--- a/scumm/debugger.cpp
+++ b/scumm/debugger.cpp
@@ -786,7 +786,7 @@ void ScummDebugger::drawBox(int box) {
 	if (vs != NULL)
 		_vm->markRectAsDirty(vs->number, 0, vs->width, 0, vs->height);
 	_vm->drawDirtyScreenParts();
-	_vm->_system->update_screen();
+	_vm->_system->updateScreen();
 }
 
 bool ScummDebugger::Cmd_PrintDraft(int argc, const char **argv) {
diff --git a/scumm/gfx.cpp b/scumm/gfx.cpp
index 2bdbbb7b86..8d4295e9e2 100644
--- a/scumm/gfx.cpp
+++ b/scumm/gfx.cpp
@@ -2446,7 +2446,7 @@ void ScummEngine::transitionEffect(int a) {
 
 		// Draw the current state to the screen and wait half a sec so the user
 		// can watch the effect taking place.
-		_system->update_screen();
+		_system->updateScreen();
 		waitForTimer(30);
 	}
 }
@@ -2552,7 +2552,7 @@ void ScummEngine::dissolveEffect(int width, int height) {
 
 		if (++blits >= blits_before_refresh) {
 			blits = 0;
-			_system->update_screen();
+			_system->updateScreen();
 			waitForTimer(30);
 		}
 	}
@@ -2560,7 +2560,7 @@ void ScummEngine::dissolveEffect(int width, int height) {
 	free(offsets);
 
 	if (blits != 0) {
-		_system->update_screen();
+		_system->updateScreen();
 		waitForTimer(30);
 	}
 }
@@ -2588,7 +2588,7 @@ void ScummEngine::scrollEffect(int dir) {
 				vs->width,
 				0, vs->height - step,
 				vs->width, step);
-			_system->update_screen();
+			_system->updateScreen();
 			waitForTimer(kPictureDelay);
 
 			y += step;
@@ -2603,7 +2603,7 @@ void ScummEngine::scrollEffect(int dir) {
 				vs->width,
 				0, 0,
 				vs->width, step);
-			_system->update_screen();
+			_system->updateScreen();
 			waitForTimer(kPictureDelay);
 
 			y += step;
@@ -2618,7 +2618,7 @@ void ScummEngine::scrollEffect(int dir) {
 				vs->width,
 				vs->width - step, 0,
 				step, vs->height);
-			_system->update_screen();
+			_system->updateScreen();
 			waitForTimer(kPictureDelay);
 
 			x += step;
@@ -2633,7 +2633,7 @@ void ScummEngine::scrollEffect(int dir) {
 				vs->width,
 				0, 0,
 				step, vs->height);
-			_system->update_screen();
+			_system->updateScreen();
 			waitForTimer(kPictureDelay);
 
 			x += step;
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index e26078f55f..69a2f127f2 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -1760,10 +1760,10 @@ void IMuseInternal::copyGlobalAdlibInstrument(byte slot, Instrument *dest) {
 //
 ////////////////////////////////////////////////////////////
 
-IMuse::IMuse(OSystem *system, IMuseInternal *target) : _system(system), _target(target) { _mutex = system->create_mutex(); }
-IMuse::~IMuse() { if (_mutex) _system->delete_mutex(_mutex); if (_target) delete _target; }
-inline void IMuse::in() const { _system->lock_mutex(_mutex); }
-inline void IMuse::out() const { _system->unlock_mutex(_mutex); }
+IMuse::IMuse(OSystem *system, IMuseInternal *target) : _system(system), _target(target) { _mutex = system->createMutex(); }
+IMuse::~IMuse() { if (_mutex) _system->deleteMutex(_mutex); if (_target) delete _target; }
+inline void IMuse::in() const { _system->lockMutex(_mutex); }
+inline void IMuse::out() const { _system->unlockMutex(_mutex); }
 
 void IMuse::on_timer(MidiDriver *midi) { in(); _target->on_timer(midi); out(); }
 void IMuse::pause(bool paused) { in(); _target->pause(paused); out(); }
diff --git a/scumm/imuse_digi/dimuse.cpp b/scumm/imuse_digi/dimuse.cpp
index 95ed94c433..5cdab989c6 100644
--- a/scumm/imuse_digi/dimuse.cpp
+++ b/scumm/imuse_digi/dimuse.cpp
@@ -43,7 +43,7 @@ void IMuseDigital::timer_handler(void *refCon) {
 
 IMuseDigital::IMuseDigital(ScummEngine *scumm)
 	: _vm(scumm) {
-	_mutex = g_system->create_mutex();
+	_mutex = g_system->createMutex();
 	_pause = false;
 	_sound = new ImuseDigiSndMgr(_vm);
 	_vm->_timer->installTimerProc(timer_handler, 1000000 / 25, this);
@@ -61,7 +61,7 @@ IMuseDigital::~IMuseDigital() {
 	stopAllSounds(true);
 	_vm->_timer->removeTimerProc(timer_handler);
 	delete _sound;
-	g_system->delete_mutex(_mutex);
+	g_system->deleteMutex(_mutex);
 }
 
 void IMuseDigital::callback() {
diff --git a/scumm/palette.cpp b/scumm/palette.cpp
index 2c4236f1ec..07f4da1170 100644
--- a/scumm/palette.cpp
+++ b/scumm/palette.cpp
@@ -911,7 +911,7 @@ void ScummEngine::updatePalette() {
 		}
 	}
 	
-	_system->set_palette(palette_colors, first, num);
+	_system->setPalette(palette_colors, first, num);
 
 	_palDirtyMax = -1;
 	_palDirtyMin = 256;
diff --git a/scumm/player_v2.cpp b/scumm/player_v2.cpp
index 53d9b88cee..4099a33383 100644
--- a/scumm/player_v2.cpp
+++ b/scumm/player_v2.cpp
@@ -349,7 +349,7 @@ Player_V2::Player_V2(ScummEngine *scumm, bool pcjr) {
 	_system = scumm->_system;
 	_mixer = scumm->_mixer;
 	_sample_rate = _system->getOutputSampleRate();
-	_mutex = _system->create_mutex();
+	_mutex = _system->createMutex();
 
 	_header_len = (scumm->_features & GF_OLD_BUNDLE) ? 4 : 6;
 
@@ -384,7 +384,7 @@ Player_V2::~Player_V2() {
 	// Detach the premix callback handler
 	_mixer->setupPremix(0, 0);
 	mutex_down();
-	_system->delete_mutex (_mutex);
+	_system->deleteMutex (_mutex);
 }
 
 void Player_V2::set_pcjr(bool pcjr) {
diff --git a/scumm/player_v2.h b/scumm/player_v2.h
index 98cf424c52..cb5e72dcc2 100644
--- a/scumm/player_v2.h
+++ b/scumm/player_v2.h
@@ -127,8 +127,8 @@ private:
 	ChannelInfo _channels[5];
 
 protected:
-	void mutex_up() { _system->lock_mutex (_mutex); }
-	void mutex_down() { _system->unlock_mutex (_mutex); }
+	void mutex_up() { _system->lockMutex (_mutex); }
+	void mutex_down() { _system->unlockMutex (_mutex); }
 
 	virtual void nextTick();
 	virtual void clear_channel(int i);
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 721004b1f9..4eeba5780b 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -1223,7 +1223,7 @@ void ScummEngine::mainRun() {
 	while (!_quit) {
 
 		updatePalette();
-		_system->update_screen();
+		_system->updateScreen();
 
 		diff -= _system->get_msecs();
 		waitForTimer(delta * 15 + diff);
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index a0dd10433d..56c8dc43a5 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -902,7 +902,7 @@ void SmushPlayer::setPalette(const byte *palette) {
 		*p++ = 0;
 	}
 
-	_vm->_system->set_palette(palette_colors, 0, 256);
+	_vm->_system->setPalette(palette_colors, 0, 256);
 }
 
 void SmushPlayer::setPaletteValue(int n, byte r, byte g, byte b) {
@@ -910,7 +910,7 @@ void SmushPlayer::setPaletteValue(int n, byte r, byte g, byte b) {
 	_pal[n * 3 + 1] = g;
 	_pal[n * 3 + 2] = b;
 
-	_vm->_system->set_palette(_pal, n, 1);
+	_vm->_system->setPalette(_pal, n, 1);
 }
 
 void SmushPlayer::updateScreen() {
@@ -1046,7 +1046,7 @@ void SmushPlayer::play(const char *filename, const char *directory, int32 offset
 			uint32 end_time, start_time;
 			
 			start_time = _vm->_system->get_msecs();
-			_vm->_system->update_screen();
+			_vm->_system->updateScreen();
 			_updateNeeded = false;
 
 			if (_insanity)