[Scummvm-cvs-logs] CVS: scummvm insane.cpp,1.38,1.39 sound.cpp,1.98,1.99 main.cpp,1.23,1.24

[Max Horn]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv28026

Modified Files:
	insane.cpp sound.cpp main.cpp 
Log Message:
got rid of some g_scumm uses

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- insane.cpp	7 Jul 2002 20:32:26 -0000	1.38
+++ insane.cpp	7 Jul 2002 21:27:03 -0000	1.39
@@ -150,7 +150,7 @@
 
 	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 @@
 						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 @@
 
 	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 @@
 			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;

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- sound.cpp	4 Jul 2002 11:18:25 -0000	1.98
+++ sound.cpp	7 Jul 2002 21:27:05 -0000	1.99
@@ -1053,7 +1053,7 @@
 	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;

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/main.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- main.cpp	18 May 2002 20:12:41 -0000	1.23
+++ main.cpp	7 Jul 2002 21:27:06 -0000	1.24
@@ -197,9 +197,9 @@
 		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;