[Scummvm-cvs-logs] CVS: scummvm/scumm/smush chunk.cpp,1.21,1.22 insane.cpp,1.14,1.15 smush_player.cpp,1.70,1.71

[Eugene Sandulenko]

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

Modified Files:
	chunk.cpp insane.cpp smush_player.cpp 
Log Message:
 o Outstanding seeking bug is fixed
 o Killed many bugs in actors' handlers
 o Implemented rest of the actors


Index: chunk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/chunk.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- chunk.cpp	8 Dec 2003 04:16:41 -0000	1.21
+++ chunk.cpp	15 Dec 2003 00:40:24 -0000	1.22
@@ -190,7 +190,9 @@
 }
 
 void FileChunk::reinit() {
+	_data->seek(0);
 	_offset = sizeof(Chunk::type) + sizeof(uint32);
+	_curPos = 0;
 	_type = _data->readUint32BE();
 	_size = _data->readUint32BE();
 	_curPos = 0;

Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- insane.cpp	14 Dec 2003 06:47:22 -0000	1.14
+++ insane.cpp	15 Dec 2003 00:40:24 -0000	1.15
@@ -49,11 +49,9 @@
 // TODO (in no particular order):
 // o After third crash Ben disappears
 // o Check why ftmacdemo doesn't finish insane scene
-// o Proper SAN seeking/switching. Now it just crashes
 // o TRS file support. Everything is in place, I just need to figure out function parameters
 // o FLU files support
 // o IACT
-// o Kill bugs
 // o Code review/cleanup
 // o DOS demo INSANE
 
[...969 lines suppressed...]
 
 void Insane::smlayer_drawSomething(byte *renderBitmap, int32 codecparam, 
@@ -5751,7 +6461,7 @@
 			if (tmp == 1000)
 				smlayer_startSound1(62);
 			smlayer_setActorFacing(1, 2, 20, 180);
-			_actor[1].act[2].state = 4; // xxx
+			_actor[1].act[2].state = 4;
 		}
 		_actor[1].kicking = 1;
 		_actor[1].act[2].tilt = calcTilt(_actor[1].speed);
@@ -6513,7 +7223,7 @@
 
 	if (arg_0) {
 		ouchSoundBen();
-		_actor[0].damage += weaponDamage(1);
+		_actor[0].damage += weaponDamage(1); // PATCH
 	}
 
 	return 1;

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- smush_player.cpp	12 Dec 2003 14:29:59 -0000	1.70
+++ smush_player.cpp	15 Dec 2003 00:40:24 -0000	1.71
@@ -975,6 +975,8 @@
 // FIXME: now it will work with offsets = 8. No Flu files are supported
 void SmushPlayer::seekSan(const char *file, const char *directory, int32 pos) {
 	Chunk *sub;
+	
+	debug(0, "seekSan(%s, %s, %d)", file, directory, pos);
 
 	if (file) {
 		if (_base)
@@ -983,8 +985,6 @@
 		_base = new FileChunk(file, directory);
 	} else {
 		_base->reinit();
-		// FIXME: this doesn't work as expected
-		//		_base->seek(pos, FileChunk::seek_start);
 	}
 
 	sub = _base->subBlock();