aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTravis Howell2007-12-28 00:18:06 +0000
committerTravis Howell2007-12-28 00:18:06 +0000
commit8f540e9b672b5fea582eaa08c4d1159993d0873d (patch)
treec25bc0aadf2a46e0f02388a9415f352fc4cd5506
parent1eeaaab15dfb39eec074f9c4148c164a7b311e18 (diff)
downloadscummvm-rg350-8f540e9b672b5fea582eaa08c4d1159993d0873d.tar.gz
scummvm-rg350-8f540e9b672b5fea582eaa08c4d1159993d0873d.tar.bz2
scummvm-rg350-8f540e9b672b5fea582eaa08c4d1159993d0873d.zip
Move more HE code to HE71, to reduce code size, when using DISABLE_HE option.
svn-id: r30023
-rw-r--r--engines/scumm/detection_tables.h2
-rw-r--r--engines/scumm/he/intern_he.h5
-rw-r--r--engines/scumm/scumm.cpp3
3 files changed, 6 insertions, 4 deletions
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 3190be2b85..208c1d5ebf 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -263,7 +263,7 @@ static const GameSettings gameVariantsTable[] = {
{"", "HE CUP", 0, GID_HECUP, 6, 200, MDT_NONE, 0, UNK},
// Humongous Entertainment Scumm Version 7.1
- // The first version to use 640x480 resolution
+ // The first version to use 640x480 resolution and wizImages
// There are also 7.1 versions of freddemo, airdemo and farmdemo
{"catalog", "", 0, GID_HEGAME, 6, 71, MDT_NONE, GF_USE_KEY, UNK},
{"freddi", "", 0, GID_HEGAME, 6, 71, MDT_NONE, GF_USE_KEY, UNK},
diff --git a/engines/scumm/he/intern_he.h b/engines/scumm/he/intern_he.h
index 9b51aec05a..c2f2d3aec8 100644
--- a/engines/scumm/he/intern_he.h
+++ b/engines/scumm/he/intern_he.h
@@ -111,7 +111,6 @@ protected:
class ScummEngine_v70he : public ScummEngine_v60he {
friend class ResExtractor;
- friend class Wiz;
protected:
typedef void (ScummEngine_v70he::*OpcodeProcv70he)();
@@ -177,11 +176,12 @@ protected:
void o70_setSystemMessage();
byte VAR_NUM_SOUND_CHANNELS;
- byte VAR_WIZ_TCOLOR;
};
#ifndef DISABLE_HE
class ScummEngine_v71he : public ScummEngine_v70he {
+ friend class Wiz;
+
protected:
typedef void (ScummEngine_v71he::*OpcodeProcv71he)();
struct OpcodeEntryv71he {
@@ -235,6 +235,7 @@ protected:
void o71_polygonOps();
void o71_polygonHit();
+ byte VAR_WIZ_TCOLOR;
public:
/* Actor AuxQueue stuff (HE) */
AuxBlock _auxBlocks[16];
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index a40137e7cc..3d1059021b 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -746,7 +746,6 @@ ScummEngine_v70he::ScummEngine_v70he(OSystem *syst, const DetectorResult &dr)
_storedFlObjects = (ObjectData *)calloc(100, sizeof(ObjectData));
VAR_NUM_SOUND_CHANNELS = 0xFF;
- VAR_WIZ_TCOLOR = 0xFF;
}
ScummEngine_v70he::~ScummEngine_v70he() {
@@ -768,6 +767,8 @@ ScummEngine_v71he::ScummEngine_v71he(OSystem *syst, const DetectorResult &dr)
_wiz = new Wiz(this);
_skipProcessActors = 0;
+
+ VAR_WIZ_TCOLOR = 0xFF;
}
ScummEngine_v71he::~ScummEngine_v71he() {