[Scummvm-cvs-logs] CVS: scummvm/bs2 anims.cpp,1.15,1.16 anims.h,1.1,1.2

[Torbj?rn Andersson]

Update of /cvsroot/scummvm/scummvm/bs2
In directory sc8-pr-cvs1:/tmp/cvs-serv26560

Modified Files:
	anims.cpp anims.h 
Log Message:
Cleanup. Apart from reformatting, I've also removed the #ifdef blocks to
skip or mute cutscenes. At the very least, we want to show the subtitles
like we do now.


Index: anims.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/anims.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- anims.cpp	17 Sep 2003 21:06:13 -0000	1.15
+++ anims.cpp	19 Sep 2003 06:41:40 -0000	1.16
@@ -17,567 +17,548 @@
  * $Header$
  */
 
-//-------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 // A more intelligent version of the old ANIMS.C
 // All this stuff by James
 // DON'T TOUCH!
-//-------------------------------------------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
 
[...1320 lines suppressed...]
-	memset(pal, 0, 256*sizeof(_palEntry));
+	memset(pal, 0, 256 * sizeof(_palEntry));
 	BS2_SetPalette(0, 256, (uint8 *) pal, RDPAL_INSTANT);
- 	//--------------------------------------------------
 
   	Zdebug("FN_play_sequence FINISHED");
 
- 	//--------------------------------------------------
-	#ifdef _MUTE_SMACKERS
-		MuteMusic(musicMuteStatus);	// set mute status back to what it was before the sequence
-	#endif
-	//----------------------------------
-
-
-	return(IR_CONT);	//	continue script
+	// continue script
+	return IR_CONT;
 }
-//---------------------------------------------------------------------------------------------------------------------
-//---------------------------------------------------------------------------------------------------------------------

Index: anims.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/bs2/anims.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- anims.h	28 Jul 2003 01:44:37 -0000	1.1
+++ anims.h	19 Sep 2003 06:41:41 -0000	1.2
@@ -20,7 +20,6 @@
 #ifndef	_ANIM_S
 #define	_ANIM_S
 
-
 #include "driver/driver96.h"
 
 int32 FN_anim(int32 *params);