[Scummvm-cvs-logs] CVS: scummvm/scumm/insane insane.cpp,1.29,1.30 insane.h,1.14,1.15 insane_scenes.cpp,1.15,1.16

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm/insane
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30060/scummvm/scumm/insane

Modified Files:
	insane.cpp insane.h insane_scenes.cpp 
Log Message:
removed not needed call for pause imuse and non used variable

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- insane.cpp	27 Jun 2004 21:52:24 -0000	1.29
+++ insane.cpp	19 Jul 2004 09:55:33 -0000	1.30
@@ -168,7 +168,6 @@
 	_smlayer_room = 0;
 	_smlayer_room2 = 0;
 	_isBenCut = 0;
-	_smush_isPauseImuse = false;
 	_continueFrame = 0;
 	_continueFrame1 = 0;
 	_counter1 = 0;
@@ -1131,14 +1130,6 @@
 	return resid;
 }
 
-void Insane::IMUSE_shutVolume(void) {
-	_vm->_imuse->pause(true);
-}
-
-void Insane::IMUSE_restoreVolume(void) {
-	_vm->_imuse->pause(false);
-}
-
 // smlayer_loadCostume1 && smlayer_loadCostume2
 int Insane::smlayer_loadCostume(int id, int phase) {
 	int resid;
@@ -1448,8 +1439,6 @@
 	debugC(DEBUG_INSANE, "Insane::smush_setupSanFile(%s, %x, %d)", filename, offset, contFrame);
 
 	_player->seekSan(filename, offset, contFrame);
-
-	_vm->_imuseDigital->pause(false);
 }
 
 }

Index: insane.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- insane.h	28 Mar 2004 10:55:32 -0000	1.14
+++ insane.h	19 Jul 2004 09:55:33 -0000	1.15
@@ -142,7 +142,6 @@
 	bool _smush_isSanFileSetup;
 	bool _isBenCut;
 	int _smush_smushState;
-	bool _smush_isPauseImuse;
 	int _continueFrame;
 	int _continueFrame1;
 	int _counter1;
@@ -363,8 +362,6 @@
 	int32 enemy8handler(int32, int32, int32);
 	int32 enemy8initializer(int32, int32, int32);
 	int32 enemyBenHandler(int32, int32, int32);
-	void IMUSE_shutVolume(void);
-	void IMUSE_restoreVolume(void);
 	bool smlayer_isSoundRunning(int32 sound);
 	bool smlayer_startSfx(int32 sound);
 	bool smlayer_startVoice(int32 sound);

Index: insane_scenes.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/insane/insane_scenes.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- insane_scenes.cpp	18 Feb 2004 05:21:32 -0000	1.15
+++ insane_scenes.cpp	19 Jul 2004 09:55:33 -0000	1.16
@@ -793,17 +793,12 @@
 		_val115_ = true;
 		if (!_keyboardDisable) {
 			smush_changeState(1);
-			_smush_isPauseImuse = true;
-			IMUSE_shutVolume();
 			_keyboardDisable = 1;
 		}
 	} else {
 		_val115_ = false;
 		if (_keyboardDisable) {
 			smush_changeState(0);
-			_smush_isPauseImuse = false;
-			IMUSE_restoreVolume();
-
 			_keyboardDisable = 0;
 		}
 	}