diff options
author | Gregory Montoir | 2007-02-03 17:55:49 +0000 |
---|---|---|
committer | Gregory Montoir | 2007-02-03 17:55:49 +0000 |
commit | 9c7dd9162683217e48a91bee8fbdd631d20a12e6 (patch) | |
tree | dd565d4aee50639fdadf7c5312e55d9c8c8e4f03 /engines/scumm | |
parent | c9cb0ca8bf0a3e906db132c7af25fb819eb315d1 (diff) | |
download | scummvm-rg350-9c7dd9162683217e48a91bee8fbdd631d20a12e6.tar.gz scummvm-rg350-9c7dd9162683217e48a91bee8fbdd631d20a12e6.tar.bz2 scummvm-rg350-9c7dd9162683217e48a91bee8fbdd631d20a12e6.zip |
removed unneeded/unnecessary variables and made SmushFont table private (to ensure getFont() get called to access them)
svn-id: r25352
Diffstat (limited to 'engines/scumm')
-rw-r--r-- | engines/scumm/smush/smush_player.cpp | 10 | ||||
-rw-r--r-- | engines/scumm/smush/smush_player.h | 4 |
2 files changed, 2 insertions, 12 deletions
diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp index cb20ca16a6..f008d8b457 100644 --- a/engines/scumm/smush/smush_player.cpp +++ b/engines/scumm/smush/smush_player.cpp @@ -238,7 +238,6 @@ void SmushPlayer::timerCallback() { SmushPlayer::SmushPlayer(ScummEngine_v7 *scumm) { _vm = scumm; - _version = -1; _nbframes = 0; _codec37 = 0; _codec47 = 0; @@ -262,7 +261,6 @@ SmushPlayer::SmushPlayer(ScummEngine_v7 *scumm) { _width = 0; _height = 0; _IACTpos = 0; - _initDone = false; _speed = -1; _insanity = false; _middleAudio = false; @@ -311,13 +309,9 @@ void SmushPlayer::init(int32 speed) { _vm->_mixer->stopHandle(_IACTchannel); _IACTpos = 0; _vm->_smixer->stop(); - - _initDone = true; } void SmushPlayer::release() { - if (!_initDone) - return; #ifdef __SYMBIAN32__ _closeOnTextTick = true; // Wait for _closeOnTextTick to be set to false to indicate file closure @@ -355,8 +349,6 @@ void SmushPlayer::release() { _vm->virtscr[0].pitch = _origPitch; _vm->_gdi->_numStrips = _origNumStrips; - _initDone = false; - delete _codec37; _codec37 = 0; delete _codec47; @@ -1010,7 +1002,7 @@ void SmushPlayer::handleAnimHeader(Chunk &b) { checkBlock(b, MKID_BE('AHDR'), 0x300 + 6); debugC(DEBUG_SMUSH, "SmushPlayer::handleAnimHeader()"); - _version = b.readUint16LE(); + /* _version = */ b.readUint16LE(); _nbframes = b.readUint16LE(); b.readUint16LE(); diff --git a/engines/scumm/smush/smush_player.h b/engines/scumm/smush/smush_player.h index db7697a196..9e3a59ab6a 100644 --- a/engines/scumm/smush/smush_player.h +++ b/engines/scumm/smush/smush_player.h @@ -40,11 +40,11 @@ class SmushPlayer { friend class Insane; private: ScummEngine_v7 *_vm; - int _version; int32 _nbframes; SmushMixer *_smixer; int16 _deltaPal[0x300]; byte _pal[0x300]; + SmushFont *_sf[5]; StringResource *_strings; Codec37Decoder *_codec37; Codec47Decoder *_codec47; @@ -70,7 +70,6 @@ private: byte _IACToutput[4096]; int32 _IACTpos; bool _storeFrame; - bool _initDone; int _speed; bool _outputSound; bool _endOfFile; @@ -105,7 +104,6 @@ public: void warpMouse(int x, int y, int buttons); protected: - SmushFont *_sf[5]; int _width, _height; int _origPitch, _origNumStrips; |