got rid of some g_scumm uses

svn-id: r4482

4 files changed, 13 insertions, 13 deletions

diff --git a/insane.cpp b/insane.cpp
index 36a7625ed0..f149d8109c 100644
--- a/insane.cpp
+++ b/insane.cpp
@@ -150,7 +150,7 @@ void SmushPlayer::parseIACT()
 
 	if (idx == MAX_STREAMER) {
 		for (idx = 0; idx < MAX_STREAMER; idx++) {
-			if (_imusTrk[idx] == 0 && g_scumm->_mixer->_channels[idx] == NULL) {
+			if (_imusTrk[idx] == 0 && g_mixer->_channels[idx] == NULL) {
 				_imusTrk[idx] = trk;
 				_imusSize[idx] = 0;
 				new_mixer = true;
@@ -252,9 +252,9 @@ void SmushPlayer::parseIACT()
 						trk, bpos, _imusRate[idx], _imusSubSize[idx]);
 
 			if (new_mixer) {
-				g_scumm->_mixer->play_stream(NULL, idx, buf, bpos, _imusRate[idx], flags);
+				g_mixer->play_stream(NULL, idx, buf, bpos, _imusRate[idx], flags);
 			} else {
-				g_scumm->_mixer->append(idx, buf, bpos, _imusRate[idx], flags);
+				g_mixer->append(idx, buf, bpos, _imusRate[idx], flags);
 			}
 
 			/* FIXME: append with re-used idx may cause problems
@@ -795,7 +795,7 @@ void SmushPlayer::parsePSAD()		// FIXME: Needs to append to
 
 	if (idx == MAX_STREAMER) {
 		for (idx = 0; idx < MAX_STREAMER; idx++) {
-			if (_psadTrk[idx] == 0 && g_scumm->_mixer->_channels[idx] == NULL) {
+			if (_psadTrk[idx] == 0 && g_mixer->_channels[idx] == NULL) {
 				_psadTrk[idx] = trk;
 				_saudSize[idx] = 0;
 				new_mixer = true;
@@ -846,10 +846,10 @@ void SmushPlayer::parsePSAD()		// FIXME: Needs to append to
 			debug(3, "trk %d: SDAT part len 0x%x rate %d", trk, sublen, _strkRate[idx]);
 
 			if (new_mixer) {
-				g_scumm->_mixer->play_stream(NULL, idx, buf, sublen, _strkRate[idx],
+				g_mixer->play_stream(NULL, idx, buf, sublen, _strkRate[idx],
 																		 SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 			} else {
-				g_scumm->_mixer->append(idx, buf, sublen,
+				g_mixer->append(idx, buf, sublen,
 																_strkRate[idx], SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE);
 			}
 			break;
diff --git a/main.cpp b/main.cpp
index 12cb4e9d9a..7bb91c1244 100644
--- a/main.cpp
+++ b/main.cpp
@@ -197,9 +197,9 @@ game settings!
 		g_scumm = scumm;
 		g_system = scumm->_system;
 		g_mixer = &scumm->_mixer[0];
-		g_scumm->_sound_volume_master = 0;
-		g_scumm->_sound_volume_music = detector._music_volume;
-		g_scumm->_sound_volume_sfx = detector._sfx_volume;
+		scumm->_sound_volume_master = 0;
+		scumm->_sound_volume_music = detector._music_volume;
+		scumm->_sound_volume_sfx = detector._sfx_volume;
 
 		/* bind to Gui */
 		scumm->_gui = &gui;
diff --git a/sound.cpp b/sound.cpp
index 541625ed3a..742db83422 100644
--- a/sound.cpp
+++ b/sound.cpp
@@ -1053,7 +1053,7 @@ int Scumm::playMP3CDTrack(int track, int num_loops, int start, int delay) {
 	unsigned int offset;
 	mad_timer_t duration;
 
-	g_scumm->_vars[g_scumm->VAR_MI1_TIMER] = 0;
+	_vars[VAR_MI1_TIMER] = 0;
 
 	if (_soundsPaused)
 		return 0;
diff --git a/wince/pocketpc.cpp b/wince/pocketpc.cpp
index 9f562ef08e..49ec1a04d7 100644
--- a/wince/pocketpc.cpp
+++ b/wince/pocketpc.cpp
@@ -412,9 +412,9 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLin
 		g_system = scumm->_system;
 		g_mixer = &scumm->_mixer[0];
 
-		g_scumm->_sound_volume_master = 0;
-		g_scumm->_sound_volume_music = detector._music_volume;
-		g_scumm->_sound_volume_sfx = detector._sfx_volume;
+		scumm->_sound_volume_master = 0;
+		scumm->_sound_volume_music = detector._music_volume;
+		scumm->_sound_volume_sfx = detector._sfx_volume;
 
 		keypad_init();
 		load_key_mapping();