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

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Tue Jan 26 09:31:28 CET 2010


Revision: 47562
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47562&view=rev
Author:   Kirben
Date:     2010-01-26 08:31:27 +0000 (Tue, 26 Jan 2010)

Log Message:
-----------
Let's Explore the Jungle with Buzzy uses VAR_PLATFORM variabletoo, but with different values.

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

Modified: scummvm/trunk/engines/scumm/detection_tables.h
===================================================================
--- scummvm/trunk/engines/scumm/detection_tables.h	2010-01-25 20:46:09 UTC (rev 47561)
+++ scummvm/trunk/engines/scumm/detection_tables.h	2010-01-26 08:31:27 UTC (rev 47562)
@@ -287,9 +287,11 @@
 
 	// Changed o_getResourceSize to cover all resource types
 	{"farm", "", 0, GID_HEGAME, 6, 73, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
-	{"jungle", "", 0, GID_HEGAME, 6, 73, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
 	{"puttzoo", "", 0, GID_HEGAME, 6, 73, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
 
+	// Added VAR_PLATFORM variable
+	{"jungle", "", 0, GID_HEGAME, 6, 74, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
+
 	// Humongous Entertainment Scumm Version 8.0 ?  Scummsrc.80
 	{"freddi2", "", 0, GID_HEGAME, 6, 80, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
 	{"pajama", "", 0, GID_HEGAME, 6, 80, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
@@ -382,6 +384,7 @@
 	{"", "HE 71",   0, GID_HEGAME, 6,  71, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
 	{"", "HE 72",   0, GID_HEGAME, 6,  72, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
 	{"", "HE 73",   0, GID_HEGAME, 6,  73, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
+	{"", "HE 74",   0, GID_HEGAME, 6,  74, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
 	{"", "HE 80",   0, GID_HEGAME, 6,  80, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
 	{"", "HE 85",   0, GID_HEGAME, 6,  85, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},
 	{"", "HE 90",   0, GID_HEGAME, 6,  90, MDT_NONE, GF_USE_KEY, UNK, GUIO_NOMIDI},

Modified: scummvm/trunk/engines/scumm/he/intern_he.h
===================================================================
--- scummvm/trunk/engines/scumm/he/intern_he.h	2010-01-25 20:46:09 UTC (rev 47561)
+++ scummvm/trunk/engines/scumm/he/intern_he.h	2010-01-26 08:31:27 UTC (rev 47562)
@@ -344,6 +344,7 @@
 	byte VAR_POLYGONS_ONLY;
 
 	byte VAR_MOUSE_STATE;			// Used in checkExecVerbs();
+	byte VAR_PLATFORM;
 };
 
 class ScummEngine_v80he : public ScummEngine_v72he {
@@ -385,7 +386,6 @@
 	void o80_drawLine();
 	void o80_pickVarRandom();
 
-	byte VAR_PLATFORM;
 	byte VAR_PLATFORM_VERSION;
 	byte VAR_CURRENT_CHARSET;
 	byte VAR_KEY_STATE;

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2010-01-25 20:46:09 UTC (rev 47561)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2010-01-26 08:31:27 UTC (rev 47562)
@@ -798,6 +798,7 @@
 	VAR_NUM_CHARSETS = 0xFF;
 	VAR_POLYGONS_ONLY = 0xFF;
 	VAR_MOUSE_STATE = 0xFF;
+	VAR_PLATFORM = 0xFF;
 }
 
 ScummEngine_v80he::ScummEngine_v80he(OSystem *syst, const DetectorResult &dr)
@@ -808,7 +809,6 @@
 	_sndTmrOffs = 0;
 	_sndDataSize = 0;
 
-	VAR_PLATFORM = 0xFF;
 	VAR_PLATFORM_VERSION = 0xFF;
 	VAR_CURRENT_CHARSET = 0xFF;
 	VAR_KEY_STATE = 0xFF;

Modified: scummvm/trunk/engines/scumm/vars.cpp
===================================================================
--- scummvm/trunk/engines/scumm/vars.cpp	2010-01-25 20:46:09 UTC (rev 47561)
+++ scummvm/trunk/engines/scumm/vars.cpp	2010-01-26 08:31:27 UTC (rev 47562)
@@ -298,12 +298,15 @@
 	if (_game.heversion <= 73) {
 		VAR_NUM_SOUND_CHANNELS = 56;
 	}
+
+	if (_game.heversion >= 74) {
+		VAR_PLATFORM = 78;
+	}
 }
 
 void ScummEngine_v80he::setupScummVars() {
 	ScummEngine_v72he::setupScummVars();
 
-	VAR_PLATFORM = 78;
 	VAR_PLATFORM_VERSION = 79;
 	VAR_CURRENT_CHARSET = 80;
 	VAR_SOUNDCODE_TMR = 84;
@@ -650,6 +653,15 @@
 	VAR(VAR_NUM_IMAGES) = _numImages - 1;
 	VAR(VAR_NUM_CHARSETS) = _numCharsets - 1;
 	VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
+
+	if (_game.heversion == 74) {
+		// Uses different values, compared to later HE80+ games.
+		if (_game.platform == Common::kPlatformMacintosh) {
+			VAR(VAR_PLATFORM) = 3;
+		} else {
+			VAR(VAR_PLATFORM) = 2;
+		}
+	}
 }
 
 void ScummEngine_v80he::resetScummVars() {


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




More information about the Scummvm-git-logs mailing list