aboutsummaryrefslogtreecommitdiff
path: root/scumm
diff options
context:
space:
mode:
authorMax Horn2003-06-20 11:21:53 +0000
committerMax Horn2003-06-20 11:21:53 +0000
commitb62e3c942fea6bda1299a27c22def1d4e8cc3ca1 (patch)
tree118c24ddb2a77a239ca298edd2f147edd4803dd6 /scumm
parentfc8e12444a74381fd3c67e49f266a689196691f5 (diff)
downloadscummvm-rg350-b62e3c942fea6bda1299a27c22def1d4e8cc3ca1.tar.gz
scummvm-rg350-b62e3c942fea6bda1299a27c22def1d4e8cc3ca1.tar.bz2
scummvm-rg350-b62e3c942fea6bda1299a27c22def1d4e8cc3ca1.zip
init _base to 0
svn-id: r8572
Diffstat (limited to 'scumm')
-rw-r--r--scumm/smush/smush_player.cpp19
-rw-r--r--scumm/smush/smush_player.h1
2 files changed, 11 insertions, 9 deletions
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index f14c88f62b..6f8511059c 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -203,27 +203,30 @@ void SmushPlayer::timerCallback(void *ptr) {
SmushPlayer::SmushPlayer(Scumm *scumm, int speed, bool subtitles) {
player = this;
+
+ _scumm = scumm;
_version = -1;
_nbframes = 0;
_smixer = 0;
_strings = NULL;
- _skipNext = false;
- _dst = NULL;
- _storeFrame = false;
- _width = 0;
- _height = 0;
- _frameBuffer = NULL;
_sf[0] = NULL;
_sf[1] = NULL;
_sf[2] = NULL;
_sf[3] = NULL;
_sf[4] = NULL;
- _scumm = scumm;
+ _base = NULL;
+ _frameBuffer = NULL;
+
+ _skipNext = false;
+ _subtitles = subtitles;
+ _dst = NULL;
+ _storeFrame = false;
+ _width = 0;
+ _height = 0;
_IACTchannel = -1,
_IACTpos = 0;
_soundFrequency = 22050;
_speed = speed;
- _subtitles = subtitles;
_smushProcessFrame = false;
}
diff --git a/scumm/smush/smush_player.h b/scumm/smush/smush_player.h
index c08d6cb570..35ebe00847 100644
--- a/scumm/smush/smush_player.h
+++ b/scumm/smush/smush_player.h
@@ -46,7 +46,6 @@ private:
FileChunk *_base;
byte *_frameBuffer;
- bool _codec37Called;
bool _skipNext;
bool _subtitles;
bool _skips[37];