[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.256,1.257 scumm.h,1.359,1.360 scummvm.cpp,2.541,2.542

[Travis Howell]

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

Modified Files:
	script_v6.cpp scumm.h scummvm.cpp 
Log Message:

Remove INSANE define.


Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.256
retrieving revision 1.257
diff -u -d -r1.256 -r1.257
--- script_v6.cpp	12 Jan 2004 15:52:58 -0000	1.256
+++ script_v6.cpp	14 Jan 2004 01:41:44 -0000	1.257
@@ -41,10 +41,6 @@
 #include "sound/mixer.h"
 
 #include "scumm/smush/insane.h"
-#ifndef INSANE
-#include "scumm/dialogs.h"		// FIXME: This is just for the FT-INSANE warning. 
-				// Remove when INSANE is implemented
-#endif
 
 namespace Scumm {
 
@@ -2437,70 +2433,10 @@
 				if (args[1] == 0) {
 					sp->play((char *)getStringAddressVar(VAR_VIDEONAME), getGameDataPath());
 				} else if (_gameId == GID_FT) {
-#ifdef INSANE
 					const int insaneVarNum = (_features & GF_DEMO) ? 232 : 233;
 
 					_insane->setSmushParams(speed);
 					_insane->runScene(insaneVarNum);
-				    
-#else
-					const int insaneVarNum = (_features & GF_DEMO) ? 232 : 233;
-					const int insaneMode = readArray(insaneVarNum,0,0);
-
-					// FIXME: FT Demo has different Insane
-					debug(1, "FT_INSANE Mode: %d", insaneMode);
-					switch (insaneMode) {
-					case 0:
-						sp->play("minedriv.san", getGameDataPath());
-						break;
-					case 1:
-						sp->play("tovista2.san", getGameDataPath());
-						break;
-					case 2:
-						sp->play("tovista1.san", getGameDataPath());
-						break;
-					case 3:
-						if (readArray(insaneVarNum,0,50) == 0) {
-							InfoDialog info(this, "Set MineRoad - You can now jump the gorge.");
-							runDialog(info);
-
-							writeArray(insaneVarNum, 0, 50, 1); // INSANE callback: Chain
-							writeArray(insaneVarNum, 0, 51, 1); // INSANE callback: Chainsaw
-							writeArray(insaneVarNum, 0, 52, 1); // INSANE callback: Mace
-							writeArray(insaneVarNum, 0, 53, 1); // INSANE callback: 2x4
-							writeArray(insaneVarNum, 0, 54, 1); // INSANE callback: Wrench
-							writeArray(insaneVarNum, 0, 55, 1); // INSANE callback: Dust
-
-							writeArray(insaneVarNum, 0, 8, 1);  // INSANE callback: Give Googles
-							writeArray(insaneVarNum, 0, 7, 1);  // INSANE callback: Give nitro fuel
-
-							putState(235, 1);	   // Cheat and activate Ramp
-							writeVar(142 | 0x8000, 1); // Cheat and activate auto-booster (fan)
-						}
-//							sp->play("minefite.san", getGameDataPath());
-						break;
-					case 4:
-						sp->play("rottopen.san", getGameDataPath());
-						break;
-					case 5:
-					case 6:
-					case 7:
-					case 8:
-						warning("FT_INSANE mode %d: Stub", args[1]);
-						break;
-					case 9:
-						sp->play("credits.san", getGameDataPath());
-						break;
-					default:
-					// Other INSANE modes
-						warning("Unknown FT_INSANE mode for %d", args[1]);
-						sp->play((char *)getStringAddressVar(VAR_VIDEONAME), getGameDataPath());
-					}
-				} else {
-					// Other INSANE modes
-					warning("Unknown insane mode for %d", args[1]);
-					sp->play((char *)getStringAddressVar(VAR_VIDEONAME), getGameDataPath());
-#endif
 				}
 				delete sp;
 			}

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.359
retrieving revision 1.360
diff -u -d -r1.359 -r1.360
--- scumm.h	11 Jan 2004 20:42:40 -0000	1.359
+++ scumm.h	14 Jan 2004 01:41:44 -0000	1.360
@@ -1006,10 +1006,8 @@
 	bool _demoMode;
 	bool _confirmExit;
 
-#ifdef INSANE
 public:
 	Insane *_insane;
-#endif
 
 public:
 	uint16 _extraBoxFlags[65];

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.541
retrieving revision 2.542
diff -u -d -r2.541 -r2.542
--- scummvm.cpp	10 Jan 2004 11:01:47 -0000	2.541
+++ scummvm.cpp	14 Jan 2004 01:41:44 -0000	2.542
@@ -847,11 +847,9 @@
 	else
 		_costumeRenderer = new CostumeRenderer(this);
 
-#ifdef INSANE
 	// Create FT INSANE object
 	if (_gameId == GID_FT)
 		_insane = new Insane(this);
-#endif
 }
 
 ScummEngine::~ScummEngine() {
@@ -1859,14 +1857,10 @@
 		// normally use F4 for this, we add in a hack that makes escape work,
 		// too (just for convenience).
 		if (_insaneState) {
-#ifdef INSANE
 			if (_gameId == GID_FT)
 				_insane->escapeKeyHandler();
 			else
 				_videoFinished = true;
-#else
-			_videoFinished = true;
-#endif
 		}
 		if (!_insaneState || _videoFinished)
 			abortCutscene();