[Scummvm-cvs-logs] SF.net SVN: scummvm: [31032] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 31032
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31032&view=rev
Author:   drmccoy
Date:     2008-03-02 15:57:29 -0800 (Sun, 02 Mar 2008)

Log Message:
-----------
Added a workaround of sorts for Inca2. It's essentially playable, sans saving, space shooter and correct speech language selection

Modified Paths:
--------------
    scummvm/trunk/engines/gob/detection.cpp
    scummvm/trunk/engines/gob/gob.cpp
    scummvm/trunk/engines/gob/gob.h
    scummvm/trunk/engines/gob/inter_v2.cpp

Modified: scummvm/trunk/engines/gob/detection.cpp
===================================================================
--- scummvm/trunk/engines/gob/detection.cpp	2008-03-02 18:03:52 UTC (rev 31031)
+++ scummvm/trunk/engines/gob/detection.cpp	2008-03-02 23:57:29 UTC (rev 31032)
@@ -1317,7 +1317,7 @@
 			kPlatformPC,
 			Common::ADGF_NO_FLAGS
 		},
-		kGameTypeGob3,
+		kGameTypeInca2,
 		kFeaturesCD,
 		"intro"
 	},

Modified: scummvm/trunk/engines/gob/gob.cpp
===================================================================
--- scummvm/trunk/engines/gob/gob.cpp	2008-03-02 18:03:52 UTC (rev 31031)
+++ scummvm/trunk/engines/gob/gob.cpp	2008-03-02 23:57:29 UTC (rev 31032)
@@ -291,6 +291,7 @@
 			break;
 
 		case kGameTypeGob3:
+		case kGameTypeInca2:
 			_init = new Init_v3(this);
 			_video = new Video_v2(this);
 			_inter = new Inter_v3(this);

Modified: scummvm/trunk/engines/gob/gob.h
===================================================================
--- scummvm/trunk/engines/gob/gob.h	2008-03-02 18:03:52 UTC (rev 31031)
+++ scummvm/trunk/engines/gob/gob.h	2008-03-02 23:57:29 UTC (rev 31032)
@@ -86,7 +86,8 @@
 	kGameTypeWoodruff,
 	kGameTypeBargon,
 	kGameTypeWeen,
-	kGameTypeLostInTime
+	kGameTypeLostInTime,
+	kGameTypeInca2
 };
 
 enum Features {

Modified: scummvm/trunk/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v2.cpp	2008-03-02 18:03:52 UTC (rev 31031)
+++ scummvm/trunk/engines/gob/inter_v2.cpp	2008-03-02 23:57:29 UTC (rev 31032)
@@ -1782,6 +1782,18 @@
 }
 
 bool Inter_v2::o2_goblinFunc(OpFuncParams &params) {
+	// TODO: In Inca 2, this is the big SpaceShoot0rz()-Opcode.
+	// It's not yet implemented, so we fudge our way through
+	// and pretend we've won.
+	if (_vm->getGameType() == kGameTypeInca2) {
+		_vm->_global->_inter_execPtr += 4;
+		uint16 resVar = (uint16) load16();
+		_vm->_global->_inter_execPtr += 4;
+
+		WRITE_VAR(resVar, 1);
+		return false;
+	}
+
 	OpGobParams gobParams;
 	int16 cmd;
 


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