[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.35,1.36 smush_player.h,1.7,1.8

Max Horn fingolfin at users.sourceforge.net
Fri Jun 20 04:25:49 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm/smush
In directory sc8-pr-cvs1:/tmp/cvs-serv873

Modified Files:
	smush_player.cpp smush_player.h 
Log Message:
init _base to 0

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- smush_player.cpp	19 Jun 2003 10:02:34 -0000	1.35
+++ smush_player.cpp	20 Jun 2003 11:21:52 -0000	1.36
@@ -203,27 +203,30 @@
 
 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;
 }
 

Index: smush_player.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- smush_player.h	18 Jun 2003 13:14:17 -0000	1.7
+++ smush_player.h	20 Jun 2003 11:21:53 -0000	1.8
@@ -46,7 +46,6 @@
 	FileChunk *_base;
 	byte *_frameBuffer;
 
-	bool _codec37Called;
 	bool _skipNext;
 	bool _subtitles;
 	bool _skips[37];





More information about the Scummvm-git-logs mailing list