aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.mingw2
-rw-r--r--scumm/script_v6.cpp64
-rw-r--r--scumm/scumm.h2
-rw-r--r--scumm/scummvm.cpp6
-rw-r--r--scumm/smush/insane.cpp3
-rw-r--r--scumm/smush/insane.h4
-rw-r--r--scumm/smush/smush_player.cpp12
7 files changed, 1 insertions, 92 deletions
diff --git a/Makefile.mingw b/Makefile.mingw
index a00947c064..844fad66c7 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -27,7 +27,7 @@ CP = cp
#######################################################################
CXXFLAGS:= -g -O -Wall -Wuninitialized -Wno-long-long -Wno-multichar -Wno-unknown-pragmas
-DEFINES += -DINSANE
+DEFINES +=
LDFLAGS :=
INCLUDES:= -I. -Icommon -Iscumm $(SDL_CFLAGS)
LIBS += $(SDL_LIBS) -lmingw32 -lwinmm
diff --git a/scumm/script_v6.cpp b/scumm/script_v6.cpp
index 824dc64187..181a4f7014 100644
--- a/scumm/script_v6.cpp
+++ b/scumm/script_v6.cpp
@@ -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 @@ void ScummEngine_v6::o6_kernelSetFunctions() {
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;
}
diff --git a/scumm/scumm.h b/scumm/scumm.h
index 4757661f73..1c4545b2d7 100644
--- a/scumm/scumm.h
+++ b/scumm/scumm.h
@@ -1006,10 +1006,8 @@ protected:
bool _demoMode;
bool _confirmExit;
-#ifdef INSANE
public:
Insane *_insane;
-#endif
public:
uint16 _extraBoxFlags[65];
diff --git a/scumm/scummvm.cpp b/scumm/scummvm.cpp
index 5d12618507..d4dc2c25cc 100644
--- a/scumm/scummvm.cpp
+++ b/scumm/scummvm.cpp
@@ -847,11 +847,9 @@ ScummEngine::ScummEngine(GameDetector *detector, OSystem *syst, const ScummGameS
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 @@ void ScummEngine::processKbd() {
// 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();
diff --git a/scumm/smush/insane.cpp b/scumm/smush/insane.cpp
index 9d4d2eae4c..5bef4de0b3 100644
--- a/scumm/smush/insane.cpp
+++ b/scumm/smush/insane.cpp
@@ -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 @@ void Insane::smush_setFrameSteps(int32 step1, int32 step2) {
}
}
-#endif // INSANE
diff --git a/scumm/smush/insane.h b/scumm/smush/insane.h
index 1f04bfe82c..47f81f3ddf 100644
--- a/scumm/smush/insane.h
+++ b/scumm/smush/insane.h
@@ -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 @@ class Insane {
};
} // End of namespace Insane
-#endif // INSANE
-
#endif
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index a7bfd6058b..81a3e5fcad 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -727,11 +727,9 @@ void SmushPlayer::handleFrame(Chunk &b) {
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 @@ void SmushPlayer::handleFrame(Chunk &b) {
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 @@ void SmushPlayer::handleFrame(Chunk &b) {
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 @@ void SmushPlayer::handleFrame(Chunk &b) {
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();
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-23 20:03:54 +0000