[Scummvm-cvs-logs] SF.net SVN: scummvm: [25352] scummvm/trunk/engines/scumm/smush
cyx at users.sourceforge.net
cyx at users.sourceforge.net
Sat Feb 3 18:55:49 CET 2007
Revision: 25352
http://scummvm.svn.sourceforge.net/scummvm/?rev=25352&view=rev
Author: cyx
Date: 2007-02-03 09:55:49 -0800 (Sat, 03 Feb 2007)
Log Message:
-----------
removed unneeded/unnecessary variables and made SmushFont table private (to ensure getFont() get called to access them)
Modified Paths:
--------------
scummvm/trunk/engines/scumm/smush/smush_player.cpp
scummvm/trunk/engines/scumm/smush/smush_player.h
Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp 2007-02-03 17:50:29 UTC (rev 25351)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp 2007-02-03 17:55:49 UTC (rev 25352)
@@ -238,7 +238,6 @@
SmushPlayer::SmushPlayer(ScummEngine_v7 *scumm) {
_vm = scumm;
- _version = -1;
_nbframes = 0;
_codec37 = 0;
_codec47 = 0;
@@ -262,7 +261,6 @@
_width = 0;
_height = 0;
_IACTpos = 0;
- _initDone = false;
_speed = -1;
_insanity = false;
_middleAudio = false;
@@ -311,13 +309,9 @@
_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 @@
_vm->virtscr[0].pitch = _origPitch;
_vm->_gdi->_numStrips = _origNumStrips;
- _initDone = false;
-
delete _codec37;
_codec37 = 0;
delete _codec47;
@@ -1010,7 +1002,7 @@
checkBlock(b, MKID_BE('AHDR'), 0x300 + 6);
debugC(DEBUG_SMUSH, "SmushPlayer::handleAnimHeader()");
- _version = b.readUint16LE();
+ /* _version = */ b.readUint16LE();
_nbframes = b.readUint16LE();
b.readUint16LE();
Modified: scummvm/trunk/engines/scumm/smush/smush_player.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.h 2007-02-03 17:50:29 UTC (rev 25351)
+++ scummvm/trunk/engines/scumm/smush/smush_player.h 2007-02-03 17:55:49 UTC (rev 25352)
@@ -40,11 +40,11 @@
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 @@
byte _IACToutput[4096];
int32 _IACTpos;
bool _storeFrame;
- bool _initDone;
int _speed;
bool _outputSound;
bool _endOfFile;
@@ -105,7 +104,6 @@
void warpMouse(int x, int y, int buttons);
protected:
- SmushFont *_sf[5];
int _width, _height;
int _origPitch, _origNumStrips;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list