[Scummvm-cvs-logs] SF.net SVN: scummvm: [30023] scummvm/trunk/engines/scumm

[Kirben at users.sourceforge.net]

Revision: 30023
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30023&view=rev
Author:   Kirben
Date:     2007-12-27 16:18:06 -0800 (Thu, 27 Dec 2007)

Log Message:
-----------
Move more HE code to HE71, to reduce code size, when using DISABLE_HE option.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/detection_tables.h
    scummvm/trunk/engines/scumm/he/intern_he.h
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/detection_tables.h
===================================================================
--- scummvm/trunk/engines/scumm/detection_tables.h	2007-12-28 00:08:29 UTC (rev 30022)
+++ scummvm/trunk/engines/scumm/detection_tables.h	2007-12-28 00:18:06 UTC (rev 30023)
@@ -263,7 +263,7 @@
 	{"", "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},

Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h	2007-12-28 00:08:29 UTC (rev 30022)
+++ scummvm/trunk/engines/scumm/he/intern_he.h	2007-12-28 00:18:06 UTC (rev 30023)
@@ -111,7 +111,6 @@
 
 class ScummEngine_v70he : public ScummEngine_v60he {
 	friend class ResExtractor;
-	friend class Wiz;
 
 protected:
 	typedef void (ScummEngine_v70he::*OpcodeProcv70he)();
@@ -177,11 +176,12 @@
 	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 @@
 	void o71_polygonOps();
 	void o71_polygonHit();
 
+	byte VAR_WIZ_TCOLOR;
 public:
 	/* Actor AuxQueue stuff (HE) */
 	AuxBlock _auxBlocks[16];

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2007-12-28 00:08:29 UTC (rev 30022)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2007-12-28 00:18:06 UTC (rev 30023)
@@ -746,7 +746,6 @@
 	_storedFlObjects = (ObjectData *)calloc(100, sizeof(ObjectData));
 
 	VAR_NUM_SOUND_CHANNELS = 0xFF;
-	VAR_WIZ_TCOLOR = 0xFF;
 }
 
 ScummEngine_v70he::~ScummEngine_v70he() {
@@ -768,6 +767,8 @@
 	_wiz = new Wiz(this);
 
 	_skipProcessActors = 0;
+
+	VAR_WIZ_TCOLOR = 0xFF;
 }
 
 ScummEngine_v71he::~ScummEngine_v71he() {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.