[Scummvm-cvs-logs] CVS: scummvm/gob gob.cpp,1.33,1.34 inter.h,1.9,1.10 inter_v2.cpp,1.3,1.4

Sven Hesse drmccoy at users.sourceforge.net
Sat Jan 14 04:26:00 CET 2006


Update of /cvsroot/scummvm/scummvm/gob
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18489

Modified Files:
	gob.cpp inter.h inter_v2.cpp 
Log Message:
Added a Gob2 opcode stub


Index: gob.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/gob.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- gob.cpp	14 Jan 2006 09:57:20 -0000	1.33
+++ gob.cpp	14 Jan 2006 12:25:27 -0000	1.34
@@ -195,7 +195,16 @@
 	// TODO
 	// Fallback. Maybe we will be able to determine game type from game
 	// data contents
-	uint32 features = Gob::GF_GOB1;
+	Common::String realGame;
+	uint32 features;
+	if (ConfMan.hasKey("gameid"))
+		realGame = ConfMan.get("gameid");
+	else
+		realGame = detector->_targetName;
+	if (!strcmp(realGame.c_str(), "gob2"))
+		features = Gob::GF_GOB2;
+	else
+		features = Gob::GF_GOB1;
 
 	for (g = gob_games; g->name; g++) {
 		if (strcmp(g->md5sum, (char *)md5str) == 0) {

Index: inter.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/inter.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- inter.h	14 Jan 2006 09:57:20 -0000	1.9
+++ inter.h	14 Jan 2006 12:25:27 -0000	1.10
@@ -299,6 +299,7 @@
 	virtual const char *getOpcodeGoblinDesc(int i);
 
 	void o2_drawStub(void) { warning("Gob2 stub"); }
+	void o2_stub0x80(void);
 };
 
 }				// End of namespace Gob

Index: inter_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/inter_v2.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- inter_v2.cpp	14 Jan 2006 09:57:20 -0000	1.3
+++ inter_v2.cpp	14 Jan 2006 12:25:27 -0000	1.4
@@ -276,7 +276,7 @@
 		{NULL, ""},
 		{NULL, ""},
 		/* 80 */
-		OPCODE(o2_drawStub),
+		OPCODE(o2_stub0x80),
 		OPCODE(o2_drawStub),
 		OPCODE(o2_drawStub),
 		OPCODE(o2_drawStub),
@@ -703,4 +703,13 @@
 	return "";
 }
 
+void Inter_v2::o2_stub0x80(void) {
+	_vm->_global->_inter_execPtr += 2;
+
+	int16 expr1 = _vm->_parse->parseValExpr();
+	int16 expr2 = _vm->_parse->parseValExpr();
+
+	warning("STUB: Gob2 drawOperation 0x80 (%d %d)", expr1, expr2);
+}
+
 } // End of namespace Gob





More information about the Scummvm-git-logs mailing list