aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--scumm/insane/insane.cpp4
-rw-r--r--scumm/insane/insane_ben.cpp4
-rw-r--r--scumm/insane/insane_enemy.cpp3
-rw-r--r--scumm/insane/insane_iact.cpp3
-rw-r--r--scumm/insane/insane_scenes.cpp3
-rw-r--r--scumm/smush/smush_font.cpp3
-rw-r--r--scumm/smush/smush_player.cpp3
7 files changed, 0 insertions, 23 deletions
diff --git a/scumm/insane/insane.cpp b/scumm/insane/insane.cpp
index 2aafc3626a..aed10e6d1c 100644
--- a/scumm/insane/insane.cpp
+++ b/scumm/insane/insane.cpp
@@ -20,8 +20,6 @@
*
*/
-#ifndef DISABLE_SCUMM_7_8
-
#include "common/stdafx.h"
#include "base/engine.h"
@@ -1465,5 +1463,3 @@ void Insane::smush_setupSanFile(const char *filename, int32 offset, int32 contFr
}
}
-
-#endif
diff --git a/scumm/insane/insane_ben.cpp b/scumm/insane/insane_ben.cpp
index dd5aac9904..a010aa5ed3 100644
--- a/scumm/insane/insane_ben.cpp
+++ b/scumm/insane/insane_ben.cpp
@@ -20,8 +20,6 @@
*
*/
-#ifndef DISABLE_SCUMM_7_8
-
#include "common/stdafx.h"
#include "base/engine.h"
@@ -2008,5 +2006,3 @@ void Insane::ouchSoundBen(void) {
}
}
-
-#endif
diff --git a/scumm/insane/insane_enemy.cpp b/scumm/insane/insane_enemy.cpp
index 87a0acbae4..e4010ffeb2 100644
--- a/scumm/insane/insane_enemy.cpp
+++ b/scumm/insane/insane_enemy.cpp
@@ -20,8 +20,6 @@
*
*/
-#ifndef DISABLE_SCUMM_7_8
-
#include "common/stdafx.h"
#include "base/engine.h"
@@ -2811,4 +2809,3 @@ int32 Insane::actionEnemy(void) {
}
-#endif
diff --git a/scumm/insane/insane_iact.cpp b/scumm/insane/insane_iact.cpp
index cf35f21a15..d9e20ad328 100644
--- a/scumm/insane/insane_iact.cpp
+++ b/scumm/insane/insane_iact.cpp
@@ -20,8 +20,6 @@
*
*/
-#ifndef DISABLE_SCUMM_7_8
-
#include "common/stdafx.h"
#include "base/engine.h"
@@ -557,4 +555,3 @@ void Insane::iactScene21(byte *renderBitmap, int32 codecparam, int32 setupsan12,
}
-#endif
diff --git a/scumm/insane/insane_scenes.cpp b/scumm/insane/insane_scenes.cpp
index be2a58e263..c5700c4861 100644
--- a/scumm/insane/insane_scenes.cpp
+++ b/scumm/insane/insane_scenes.cpp
@@ -20,8 +20,6 @@
*
*/
-#ifndef DISABLE_SCUMM_7_8
-
#include "common/stdafx.h"
#include "base/engine.h"
@@ -1498,4 +1496,3 @@ void Insane::postCaseMore(byte *renderBitmap, int32 codecparam, int32 setupsan12
}
-#endif
diff --git a/scumm/smush/smush_font.cpp b/scumm/smush/smush_font.cpp
index 4301af5536..3b50c0f51c 100644
--- a/scumm/smush/smush_font.cpp
+++ b/scumm/smush/smush_font.cpp
@@ -19,8 +19,6 @@
*
*/
-#ifndef DISABLE_SCUMM_7_8
-
#include "common/stdafx.h"
#include "common/file.h"
#include "scumm/scumm.h"
@@ -268,4 +266,3 @@ void SmushFont::drawStringWrap(const char *str, byte *buffer, int dst_width, int
} // End of namespace Scumm
-#endif
diff --git a/scumm/smush/smush_player.cpp b/scumm/smush/smush_player.cpp
index a93e96dea6..efaca21590 100644
--- a/scumm/smush/smush_player.cpp
+++ b/scumm/smush/smush_player.cpp
@@ -18,8 +18,6 @@
* $Header$
*
*/
-
-#ifndef DISABLE_SCUMM_7_8
#include "common/stdafx.h"
@@ -1311,4 +1309,3 @@ void SmushPlayer::play(const char *filename, int32 offset, int32 startFrame) {
} // End of namespace Scumm
-#endif