diff options
| author | Travis Howell | 2004-01-14 01:41:44 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-01-14 01:41:44 +0000 |
| commit | 1fa4231c47491a68d5272b62b2904a7892859ad9 (patch) | |
| tree | d62ec7a62fe68e7124a76a5f77bf3ad115135cb9 /scumm/smush | |
| parent | 51434558f4ed62280457d03245cf2a3aec5b6916 (diff) | |
| download | scummvm-rg350-1fa4231c47491a68d5272b62b2904a7892859ad9.tar.gz scummvm-rg350-1fa4231c47491a68d5272b62b2904a7892859ad9.tar.bz2 scummvm-rg350-1fa4231c47491a68d5272b62b2904a7892859ad9.zip | |
Remove INSANE define.
svn-id: r12363
Diffstat (limited to 'scumm/smush')
| -rw-r--r-- | scumm/smush/insane.cpp | 3 | ||||
| -rw-r--r-- | scumm/smush/insane.h | 4 | ||||
| -rw-r--r-- | scumm/smush/smush_player.cpp | 12 |
3 files changed, 0 insertions, 19 deletions
diff --git a/scumm/smush/insane.cpp b/scumm/smush/insane.cpp index 9d4d2eae4c..5bef4de0b3 100644 --- a/scumm/smush/insane.cpp +++ b/scumm/smush/insane.cpp @@ -39,8 +39,6 @@ #include "scumm/smush/chunk.h" #include "scumm/smush/insane.h" -#ifdef INSANE - // TODO (in no particular order): // o Ben's velocity don't get zeroed after crash // o TRS file support. Everything is in place, I just need to figure out function parameters @@ -8185,4 +8183,3 @@ void Insane::smush_setFrameSteps(int32 step1, int32 step2) { } } -#endif // INSANE diff --git a/scumm/smush/insane.h b/scumm/smush/insane.h index 1f04bfe82c..47f81f3ddf 100644 --- a/scumm/smush/insane.h +++ b/scumm/smush/insane.h @@ -29,8 +29,6 @@ #include "scumm/smush/smush_player.h" #include "scumm/smush/chunk.h" -#ifdef INSANE - namespace Scumm { #define INV_CHAIN 0 @@ -477,6 +475,4 @@ class Insane { }; } // End of namespace Insane -#endif // INSANE - #endif diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp index a7bfd6058b..81a3e5fcad 100644 --- a/scumm/smush/smush_player.cpp +++ b/scumm/smush/smush_player.cpp @@ -727,11 +727,9 @@ void SmushPlayer::handleFrame(Chunk &b) { uint32 start_time, end_time; start_time = _vm->_system->get_msecs(); -#ifdef INSANE if (_insanity) { _vm->_insane->procPreRendering(); } -#endif while (!b.eof()) { Chunk *sub = b.subBlock(); @@ -753,15 +751,11 @@ void SmushPlayer::handleFrame(Chunk &b) { handleDeltaPalette(*sub); break; case TYPE_IACT: -#ifdef INSANE // FIXME: check parameters if (_insanity) _vm->_insane->procIACT(_dst, 0, 0, 0, *sub, 0, 0); else handleIACT(*sub); -#else - handleIACT(*sub); -#endif break; case TYPE_STOR: handleStore(*sub); @@ -770,14 +764,10 @@ void SmushPlayer::handleFrame(Chunk &b) { handleFetch(*sub); break; case TYPE_SKIP: -#ifdef INSANE if (_insanity) _vm->_insane->procSKIP(*sub); else handleSkip(*sub); -#else - handleSkip(*sub); -#endif break; case TYPE_TEXT: handleTextResource(*sub); @@ -788,12 +778,10 @@ void SmushPlayer::handleFrame(Chunk &b) { delete sub; } -#ifdef INSANE // FIXME: Check either parameters are valid if (_insanity) { _vm->_insane->procPostRendering(_dst, 0, 0, 0, _frame, _nbframes-1); } -#endif end_time = _vm->_system->get_msecs(); |