diff options
| author | Max Horn | 2006-10-07 13:57:06 +0000 |
|---|---|---|
| committer | Max Horn | 2006-10-07 13:57:06 +0000 |
| commit | 4973c657b81344409544dd340cf498e6a745b2b7 (patch) | |
| tree | a09bdf1e3fb1a2aa8c86ef687a14bc5603fccc95 /engines/scumm/smush | |
| parent | f6407f01f88633266b92b2f8950a072e49b2a17c (diff) | |
| download | scummvm-rg350-4973c657b81344409544dd340cf498e6a745b2b7.tar.gz scummvm-rg350-4973c657b81344409544dd340cf498e6a745b2b7.tar.bz2 scummvm-rg350-4973c657b81344409544dd340cf498e6a745b2b7.zip | |
Moved all INSANE and SMUSH related code into ScummEngine_v7 (resp. ScummEngine_v6 in a few cases)
svn-id: r24169
Diffstat (limited to 'engines/scumm/smush')
| -rw-r--r-- | engines/scumm/smush/chunk.cpp | 7 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/smush/smush_player.h | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/engines/scumm/smush/chunk.cpp b/engines/scumm/smush/chunk.cpp index 2d457e0d85..d698baa844 100644 --- a/engines/scumm/smush/chunk.cpp +++ b/engines/scumm/smush/chunk.cpp @@ -84,9 +84,10 @@ bool BaseChunk::seek(int32 delta, seek_type dir) { } if (_curPos > _size) { - if (g_scumm->_insaneRunning) { - warning("Looks like you compressed file %s in wrong way. It has FLU index which was not updated", _name.c_str()); - } +// FIXME: This is an evil hack, can't we do better?! +// if (g_scumm->_insaneRunning) { +// warning("Looks like you compressed file %s in wrong way. It has FLU index which was not updated", _name.c_str()); +// } error("invalid seek request : %d > %d (delta == %d)", _curPos, _size, delta); } return true; diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 94409d5d09..d4f9164f83 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -235,7 +235,7 @@ void SmushPlayer::timerCallback(void *refCon) { #endif } -SmushPlayer::SmushPlayer(ScummEngine_v6 *scumm, int speed) { +SmushPlayer::SmushPlayer(ScummEngine_v7 *scumm, int speed) { _vm = scumm; _version = -1; _nbframes = 0; diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h index e5ea8be04e..3b22a41b4e 100644 --- a/engines/scumm/smush/smush_player.h +++ b/engines/scumm/smush/smush_player.h @@ -31,7 +31,7 @@ namespace Scumm { -class ScummEngine_v6; +class ScummEngine_v7; class SmushFont; class SmushMixer; class StringResource; @@ -39,7 +39,7 @@ class StringResource; class SmushPlayer { friend class Insane; private: - ScummEngine_v6 *_vm; + ScummEngine_v7 *_vm; int _version; int32 _nbframes; SmushMixer *_smixer; @@ -95,7 +95,7 @@ private: Common::Mutex _mutex; public: - SmushPlayer(ScummEngine_v6 *scumm, int speed); + SmushPlayer(ScummEngine_v7 *scumm, int speed); ~SmushPlayer(); void play(const char *filename, int32 offset = 0, int32 startFrame = 0); |