[Scummvm-cvs-logs] CVS: scummvm/gob game.cpp,1.22,1.23 inter.cpp,1.20,1.21 parse.cpp,1.12,1.13

[Eugene Sandulenko]

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

Modified Files:
	game.cpp inter.cpp parse.cpp 
Log Message:
Some stubs for gob2.
Improved debug output.


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/game.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- game.cpp	10 Jul 2005 13:37:03 -0000	1.22
+++ game.cpp	19 Jul 2005 09:10:04 -0000	1.23
@@ -1176,6 +1176,8 @@
 		}
 		cmd &= 0x7f;
 
+		debug(4, "game_collisionsBlock(%d)", cmd);
+
 		switch (cmd) {
 		case 3:
 		case 4:

Index: inter.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/inter.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- inter.cpp	14 Jun 2005 20:20:57 -0000	1.20
+++ inter.cpp	19 Jul 2005 09:10:05 -0000	1.21
@@ -318,11 +318,13 @@
 }
 
 void inter_drawOperations(void) {
-	char cmd;
+	byte cmd;
 	int16 i;
 
 	cmd = *inter_execPtr++;
 
+	debug(4, "inter_drawOperations(%d)", cmd);
+
 	switch (cmd) {
 	case 0:
 		inter_loadMult();
@@ -413,24 +415,46 @@
 		break;
 
 	case 32:
-		// Used in gob1 CD
-		inter_evalExpr(0);
-		cd_startTrack(inter_resStr);
+		if (_vm->_features & GF_GOB1) {
+			// Used in gob1 CD
+			inter_evalExpr(0);
+			cd_startTrack(inter_resStr);
+		} else {
+		}
 		break;
 
 	case 33:
-		// Used in gob1 CD
-		{
-		int pos = cd_getTrackPos();
-		if (pos == -1)
-			pos = 32767;
-		WRITE_VAR(5, pos);
+		if (_vm->_features & GF_GOB1) {
+			// Used in gob1 CD
+			int pos = cd_getTrackPos();
+			if (pos == -1)
+				pos = 32767;
+			WRITE_VAR(5, pos);
+		} else {
 		}
 		break;
 
 	case 34:
-		// Used in gob1 CD
-		cd_stopPlaying();
+		if (_vm->_features & GF_GOB1) {
+			// Used in gob1 CD
+			cd_stopPlaying();
+		} else {
+		}
+		break;
+
+	case 35:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 36:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 37:
+		if (_vm->_features & GF_GOB2) {
+		}
 		break;
 
 	case 48:
@@ -449,6 +473,106 @@
 		draw_fontToSprite[i].height = -1;
 		break;
 
+	case 64:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 65:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 66:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 67:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 80:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 81:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 82:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 83:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 84:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 85:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 86:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 128:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 129:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 130:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 131:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 132:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 133:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 134:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 135:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
+	case 136:
+		if (_vm->_features & GF_GOB2) {
+		}
+		break;
+
 	default:
 		warning("unimplemented drawOperation: %d", cmd);
 	}
@@ -1166,6 +1290,9 @@
 
 		inter_execPtr++;
 		counter++;
+
+		debug(4, "inter_funcBlock(%d, %d)", cmd2, cmd);
+
 		switch (cmd2) {
 		case 0:
 			switch (cmd >> 4) {

Index: parse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gob/parse.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- parse.cpp	8 May 2005 21:49:41 -0000	1.12
+++ parse.cpp	19 Jul 2005 09:10:05 -0000	1.13
@@ -958,17 +958,17 @@
 	int16 val;
 
 	operation = *inter_execPtr++;
-	debug(5, "var parse = %d\n", operation);
+	debug(5, "var parse = %d", operation);
 	switch (operation) {
 	case 23:
 	case 25:
 		temp = inter_load16() * 4;
-		debug(5, "oper = %d\n", (int16)*inter_execPtr);
+		debug(5, "oper = %d", (int16)*inter_execPtr);
 		if (operation == 25 && *inter_execPtr == 13) {
 			inter_execPtr++;
 			val = parse_parseValExpr();
 			temp += val;
-			debug(5, "parse subscript = %d\n", val);
+			debug(5, "parse subscript = %d", val);
 		}
 		return temp;