aboutsummaryrefslogtreecommitdiff
path: root/engines/scumm
diff options
context:
space:
mode:
authorPaweł Kołodziejski2006-10-08 19:23:08 +0000
committerPaweł Kołodziejski2006-10-08 19:23:08 +0000
commit4e22b8262a7db51a3926682f36c45b850a387670 (patch)
tree106649af5e5302adc8beeafd618643e1afe7b40a /engines/scumm
parentd6665bc92933a9bbe4481c0222be943e205c7576 (diff)
downloadscummvm-rg350-4e22b8262a7db51a3926682f36c45b850a387670.tar.gz
scummvm-rg350-4e22b8262a7db51a3926682f36c45b850a387670.tar.bz2
scummvm-rg350-4e22b8262a7db51a3926682f36c45b850a387670.zip
remove handleSkip code, SKIP chunk is only used by INSANE code and exist only in 4 SAN files: minedriv, toranch, tovista1, tovista2
svn-id: r24221
Diffstat (limited to 'engines/scumm')
-rw-r--r--engines/scumm/smush/smush_player.cpp16
-rw-r--r--engines/scumm/smush/smush_player.h2
2 files changed, 1 insertions, 17 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 6980274592..0e85b6c8b6 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -405,16 +405,6 @@ void SmushPlayer::handleSoundFrame(Chunk &b) {
handleSoundBuffer(track_id, index, max_frames, flags, vol, pan, b, size);
}
-void SmushPlayer::handleSkip(Chunk &b) {
- checkBlock(b, TYPE_SKIP, 4);
- int32 code = b.getDword();
- debugC(DEBUG_SMUSH, "SmushPlayer::handleSkip(%d)", code);
- if (code >= 0 && code < 37)
- _skipNext = _skips[code];
- else
- _skipNext = true;
-}
-
void SmushPlayer::handleStore(Chunk &b) {
debugC(DEBUG_SMUSH, "SmushPlayer::handleStore()");
checkBlock(b, TYPE_STOR, 4);
@@ -991,11 +981,7 @@ void SmushPlayer::handleFrame(Chunk &b) {
handleFetch(*sub);
break;
case TYPE_SKIP:
- if (_insanity)
- _vm->_insane->procSKIP(*sub);
- else
- handleSkip(*sub);
- break;
+ _vm->_insane->procSKIP(*sub);
case TYPE_TEXT:
handleTextResource(*sub);
break;
diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h
index 3b22a41b4e..455f1414b9 100644
--- a/engines/scumm/smush/smush_player.h
+++ b/engines/scumm/smush/smush_player.h
@@ -57,7 +57,6 @@ private:
int32 _seekFrame;
bool _skipNext;
- bool _skips[37];
int32 _frame;
Audio::SoundHandle _IACTchannel;
@@ -133,7 +132,6 @@ private:
void handleFrameObject(Chunk &);
void handleSoundBuffer(int32, int32, int32, int32, int32, int32, Chunk &, int32);
void handleSoundFrame(Chunk &);
- void handleSkip(Chunk &);
void handleStore(Chunk &);
void handleFetch(Chunk &);
void handleIACT(Chunk &);