[Scummvm-cvs-logs] CVS: scummvm/scumm/smush insane.cpp,1.32,1.33 insane.h,1.18,1.19 smush_player.cpp,1.97,1.98

[Travis Howell]

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

Modified Files:
	insane.cpp insane.h smush_player.cpp 
Log Message:

Remove INSANE define.


Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.cpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- insane.cpp	8 Jan 2004 20:37:26 -0000	1.32
+++ insane.cpp	14 Jan 2004 01:41:44 -0000	1.33
@@ -39,8 +39,6 @@
 #include "scumm/smush/chunk.h"
 #include "scumm/smush/insane.h"
 
-#ifdef INSANE
-
 // TODO (in no particular order):
 // o Ben's velocity don't get zeroed after crash
 // o TRS file support. Everything is in place, I just need to figure out function parameters
@@ -8185,4 +8183,3 @@
 }
 
 }
-#endif // INSANE

Index: insane.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/insane.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- insane.h	8 Jan 2004 20:37:26 -0000	1.18
+++ insane.h	14 Jan 2004 01:41:44 -0000	1.19
@@ -29,8 +29,6 @@
 #include "scumm/smush/smush_player.h"
 #include "scumm/smush/chunk.h"
 
-#ifdef INSANE
-
 namespace Scumm {
 
 #define INV_CHAIN    0
@@ -477,6 +475,4 @@
 };
 } // End of namespace Insane
 
-#endif // INSANE
-
 #endif

Index: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- smush_player.cpp	9 Jan 2004 23:33:46 -0000	1.97
+++ smush_player.cpp	14 Jan 2004 01:41:44 -0000	1.98
@@ -727,11 +727,9 @@
 	uint32 start_time, end_time;
 	start_time = _vm->_system->get_msecs();
 
-#ifdef INSANE
 	if (_insanity) {
 		_vm->_insane->procPreRendering();
 	}
-#endif
 
 	while (!b.eof()) {
 		Chunk *sub = b.subBlock();
@@ -753,15 +751,11 @@
 			handleDeltaPalette(*sub);
 			break;
 		case TYPE_IACT:
-#ifdef INSANE
 			// FIXME: check parameters
 			if (_insanity)
 				_vm->_insane->procIACT(_dst, 0, 0, 0, *sub, 0, 0);
 			else
 				handleIACT(*sub);
-#else
-			handleIACT(*sub);
-#endif
 			break;
 		case TYPE_STOR:
 			handleStore(*sub);
@@ -770,14 +764,10 @@
 			handleFetch(*sub);
 			break;
 		case TYPE_SKIP:
-#ifdef INSANE
 			if (_insanity)
 				_vm->_insane->procSKIP(*sub);
 			else
 				handleSkip(*sub);
-#else
-			handleSkip(*sub);
-#endif
 			break;
 		case TYPE_TEXT:
 			handleTextResource(*sub);
@@ -788,12 +778,10 @@
 		delete sub;
 	}
 
-#ifdef INSANE
 	// FIXME: Check either parameters are valid
 	if (_insanity) {
 		_vm->_insane->procPostRendering(_dst, 0, 0, 0, _frame, _nbframes-1);
 	}
-#endif
 
 	end_time = _vm->_system->get_msecs();