aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2004-07-19 09:55:33 +0000
committerPaweł Kołodziejski2004-07-19 09:55:33 +0000
commitdc9963ec976f888d6691159e021651973b83fb01 (patch)
treeec5e79af4fbd8da3618928ba8ee9dc8d6b238446 /scumm
parent5ecfa56b5ee20f1a439fd50870d1e2e101981020 (diff)
downloadscummvm-rg350-dc9963ec976f888d6691159e021651973b83fb01.tar.gz
scummvm-rg350-dc9963ec976f888d6691159e021651973b83fb01.tar.bz2
scummvm-rg350-dc9963ec976f888d6691159e021651973b83fb01.zip
removed not needed call for pause imuse and non used variable
svn-id: r14271
Diffstat (limited to 'scumm')
-rw-r--r--scumm/insane/insane.cpp11
-rw-r--r--scumm/insane/insane.h3
-rw-r--r--scumm/insane/insane_scenes.cpp5
3 files changed, 0 insertions, 19 deletions
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp
index f98cb83f3a..a93cdc5a62 100644
--- a/scumm/insane/insane.cpp
+++ b/scumm/insane/insane.cpp
@@ -168,7 +168,6 @@ void Insane::initvars(void) {
_smlayer_room = 0;
_smlayer_room2 = 0;
_isBenCut = 0;
- _smush_isPauseImuse = false;
_continueFrame = 0;
_continueFrame1 = 0;
_counter1 = 0;
@@ -1131,14 +1130,6 @@ int Insane::smlayer_loadSound(int id, int flag, int phase) {
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 @@ void Insane::smush_setupSanFile(const char *filename, int32 offset, int32 contFr
debugC(DEBUG_INSANE, "Insane::smush_setupSanFile(%s, %x, %d)", filename, offset, contFrame);
_player->seekSan(filename, offset, contFrame);
-
- _vm->_imuseDigital->pause(false);
}
}
diff --git a/scumm/insane/insane.h b/scumm/insane/insane.h
index 8b507965bf..7c8d9923a8 100644
--- a/scumm/insane/insane.h
+++ b/scumm/insane/insane.h
@@ -142,7 +142,6 @@ class Insane {
bool _smush_isSanFileSetup;
bool _isBenCut;
int _smush_smushState;
- bool _smush_isPauseImuse;
int _continueFrame;
int _continueFrame1;
int _counter1;
@@ -363,8 +362,6 @@ class Insane {
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);
diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp
index b88e02a173..4059b25283 100644
--- a/scumm/insane/insane_scenes.cpp
+++ b/scumm/insane/insane_scenes.cpp
@@ -793,17 +793,12 @@ void Insane::procPreRendering(void) {
_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;
}
}