aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorMax Horn2007-12-31 16:34:30 +0000
committerMax Horn2007-12-31 16:34:30 +0000
commitbe11104d7056c41d4c326c6762162a1c7e64dfd2 (patch)
tree3d7f1ec7bc7a1e3a5cec9bc9232c0cdf08f22f21 /engines/scumm
parentb87b0f21f0e874f1d668a248139e173b6509c13f (diff)
downloadscummvm-rg350-be11104d7056c41d4c326c6762162a1c7e64dfd2.tar.gz
scummvm-rg350-be11104d7056c41d4c326c6762162a1c7e64dfd2.tar.bz2
scummvm-rg350-be11104d7056c41d4c326c6762162a1c7e64dfd2.zip
Removed obsolete _insaneRunning flag
svn-id: r30107
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/intern.h3
-rw-r--r--engines/scumm/script_v6.cpp2
-rw-r--r--engines/scumm/scumm.cpp1
3 files changed, 0 insertions, 6 deletions
diff --git a/engines/scumm/intern.h b/engines/scumm/intern.h
index 373d17fe62..0ed64aa178 100644
--- a/engines/scumm/intern.h
+++ b/engines/scumm/intern.h
@@ -866,9 +866,6 @@ protected:
Insane *_insane;
public:
- /** This flag tells IMuseDigital that INSANE is running. */
- bool _insaneRunning; // Used by IMuseDigital::flushTracks()
-
SmushMixer *_smixer;
SmushPlayer *_splayer;
diff --git a/engines/scumm/script_v6.cpp b/engines/scumm/script_v6.cpp
index 4a2e8fd0bb..bc4c56428d 100644
--- a/engines/scumm/script_v6.cpp
+++ b/engines/scumm/script_v6.cpp
@@ -2547,10 +2547,8 @@ void ScummEngine_v7::o6_kernelSetFunctions() {
const int insaneVarNum = ((_game.features & GF_DEMO) && (_game.platform == Common::kPlatformPC))
? 232 : 233;
- _insaneRunning = true;
_insane->setSmushParams(_smushFrameRate);
_insane->runScene(insaneVarNum);
- _insaneRunning = false;
}
}
break;
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 3d1059021b..127bd76a11 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -886,7 +886,6 @@ ScummEngine_v7::ScummEngine_v7(OSystem *syst, const DetectorResult &dr)
_smushFrameRate = 0;
_smushVideoShouldFinish = false;
_smushActive = false;
- _insaneRunning = false;
_smixer = NULL;
_splayer = NULL;