diff options
| author | Max Horn | 2006-10-07 17:42:32 +0000 |
|---|---|---|
| committer | Max Horn | 2006-10-07 17:42:32 +0000 |
| commit | ff6731e00a86d81bcc392c57586670a94497ded0 (patch) | |
| tree | 0d1451fd45b06042c8d7999cb59807fe5e426cee /engines/scumm/smush | |
| parent | 71bea97de7f4127cf45a4df5d824e9c7db32cc5c (diff) | |
| download | scummvm-rg350-ff6731e00a86d81bcc392c57586670a94497ded0.tar.gz scummvm-rg350-ff6731e00a86d81bcc392c57586670a94497ded0.tar.bz2 scummvm-rg350-ff6731e00a86d81bcc392c57586670a94497ded0.zip | |
Removed 'smushMode' param from processInput and processKeyboard in favor of a new member _smushActive of ScummEngine_v7
svn-id: r24175
Diffstat (limited to 'engines/scumm/smush')
| -rw-r--r-- | engines/scumm/smush/smush_player.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index d4f9164f83..7bdc70450d 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -284,7 +284,10 @@ SmushPlayer::~SmushPlayer() { void SmushPlayer::init() { _frame = 0; _alreadyInit = false; + _vm->_smushVideoShouldFinish = false; + _vm->_smushActive = true; + _vm->setDirtyColors(0, 255); _dst = _vm->virtscr[0].getPixels(0, 0); @@ -342,6 +345,7 @@ void SmushPlayer::release() { _vm->_mixer->stopHandle(_IACTchannel); _IACTstream = NULL; + _vm->_smushActive = false; _vm->_fullRedraw = true; // HACK HACK HACK: This is an *evil* trick, beware! See above for @@ -1320,7 +1324,7 @@ void SmushPlayer::play(const char *filename, int32 offset, int32 startFrame) { _warpNeeded = false; } _vm->parseEvents(); - _vm->processInput(true); + _vm->processInput(); if (_palDirtyMax >= _palDirtyMin) { byte palette_colors[1024]; byte *p = palette_colors; |