[Scummvm-cvs-logs] SF.net SVN: scummvm: [24221] scummvm/trunk/engines/scumm/smush

[aquadran at users.sourceforge.net]

Revision: 24221
          http://svn.sourceforge.net/scummvm/?rev=24221&view=rev
Author:   aquadran
Date:     2006-10-08 12:23:08 -0700 (Sun, 08 Oct 2006)

Log Message:
-----------
remove handleSkip code, SKIP chunk is only used by INSANE code and exist only in 4 SAN files: minedriv, toranch, tovista1, tovista2

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	2006-10-08 19:07:43 UTC (rev 24220)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp	2006-10-08 19:23:08 UTC (rev 24221)
@@ -405,16 +405,6 @@
 	handleSoundBuffer(track_id, index, max_frames, flags, vol, pan, b, size);
 }
 
-void SmushPlayer::handleSkip(Chunk &b) {
-	checkBlock(b, TYPE_SKIP, 4);
-	int32 code = b.getDword();
-	debugC(DEBUG_SMUSH, "SmushPlayer::handleSkip(%d)", code);
-	if (code >= 0 && code < 37)
-		_skipNext = _skips[code];
-	else
-		_skipNext = true;
-}
-
 void SmushPlayer::handleStore(Chunk &b) {
 	debugC(DEBUG_SMUSH, "SmushPlayer::handleStore()");
 	checkBlock(b, TYPE_STOR, 4);
@@ -991,11 +981,7 @@
 			handleFetch(*sub);
 			break;
 		case TYPE_SKIP:
-			if (_insanity)
-				_vm->_insane->procSKIP(*sub);
-			else
-				handleSkip(*sub);
-			break;
+			_vm->_insane->procSKIP(*sub);
 		case TYPE_TEXT:
 			handleTextResource(*sub);
 			break;

Modified: scummvm/trunk/engines/scumm/smush/smush_player.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.h	2006-10-08 19:07:43 UTC (rev 24220)
+++ scummvm/trunk/engines/scumm/smush/smush_player.h	2006-10-08 19:23:08 UTC (rev 24221)
@@ -57,7 +57,6 @@
 	int32 _seekFrame;
 
 	bool _skipNext;
-	bool _skips[37];
 	int32 _frame;
 
 	Audio::SoundHandle _IACTchannel;
@@ -133,7 +132,6 @@
 	void handleFrameObject(Chunk &);
 	void handleSoundBuffer(int32, int32, int32, int32, int32, int32, Chunk &, int32);
 	void handleSoundFrame(Chunk &);
-	void handleSkip(Chunk &);
 	void handleStore(Chunk &);
 	void handleFetch(Chunk &);
 	void handleIACT(Chunk &);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.