diff options
author | Kostas Nakos | 2008-08-18 17:24:25 +0000 |
---|---|---|
committer | Kostas Nakos | 2008-08-18 17:24:25 +0000 |
commit | b809665671bd954faaa334677d877a37e961a0aa (patch) | |
tree | 79a98070bffd5653c9a312545bcda149009922b9 /engines/scumm | |
parent | c2089be66063515821b8aea6a7a815a8d1d7dbef (diff) | |
download | scummvm-rg350-b809665671bd954faaa334677d877a37e961a0aa.tar.gz scummvm-rg350-b809665671bd954faaa334677d877a37e961a0aa.tar.bz2 scummvm-rg350-b809665671bd954faaa334677d877a37e961a0aa.zip |
do away with the smush force redraw hack
svn-id: r33991
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/smush/smush_player.cpp | 20 | ||||
-rw-r--r-- | engines/scumm/smush/smush_player.h | 5 |
2 files changed, 0 insertions, 25 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index 494357a90c..d2844d8f8c 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -212,10 +212,6 @@ static StringResource *getStrings(ScummEngine *vm, const char *file, bool is_enc void SmushPlayer::timerCallback() { parseNextFrame(); -#ifdef _WIN32_WCE - _inTimer = true; - _inTimerCount++; -#endif } SmushPlayer::SmushPlayer(ScummEngine_v7 *scumm) { @@ -252,11 +248,6 @@ SmushPlayer::SmushPlayer(ScummEngine_v7 *scumm) { _paused = false; _pauseStartTime = 0; _pauseTime = 0; -#ifdef _WIN32_WCE - _inTimer = false; - _inTimerCount = 0; - _inTimerCountRedraw = ConfMan.getInt("Smush_force_redraw"); -#endif } SmushPlayer::~SmushPlayer() { @@ -926,14 +917,7 @@ void SmushPlayer::handleFrame(Chunk &b) { } if (_width != 0 && _height != 0) { -#ifdef _WIN32_WCE - if (!_inTimer || _inTimerCount == _inTimerCountRedraw) { - updateScreen(); - _inTimerCount = 0; - } -#else updateScreen(); -#endif } _smixer->handleFrame(); @@ -1326,10 +1310,6 @@ void SmushPlayer::play(const char *filename, int32 speed, int32 offset, int32 st _vm->_system->updateScreen(); _updateNeeded = false; } -#ifdef _WIN32_WCE - _inTimer = false; - _inTimerCount = 0; -#endif } if (_endOfFile) break; diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h index 413a5895d3..64ae167349 100644 --- a/engines/scumm/smush/smush_player.h +++ b/engines/scumm/smush/smush_player.h @@ -84,11 +84,6 @@ private: bool _insanity; bool _middleAudio; bool _skipPalette; -#ifdef _WIN32_WCE - bool _inTimer; - int16 _inTimerCount; - int16 _inTimerCountRedraw; -#endif public: SmushPlayer(ScummEngine_v7 *scumm); |