[Scummvm-cvs-logs] SF.net SVN: scummvm: [23061] scummvm/branches/branch-0-9-0/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Mon Jun 12 15:54:21 CEST 2006
Revision: 23061
Author: drmccoy
Date: 2006-06-12 06:54:07 -0700 (Mon, 12 Jun 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=23061&view=rev
Log Message:
-----------
Commenting out all Gob2 related warnings
Modified Paths:
--------------
scummvm/branches/branch-0-9-0/engines/gob/draw.cpp
scummvm/branches/branch-0-9-0/engines/gob/game.cpp
scummvm/branches/branch-0-9-0/engines/gob/goblin.cpp
scummvm/branches/branch-0-9-0/engines/gob/inter.h
scummvm/branches/branch-0-9-0/engines/gob/inter_v2.cpp
scummvm/branches/branch-0-9-0/engines/gob/mult_v2.cpp
scummvm/branches/branch-0-9-0/engines/gob/music.cpp
Modified: scummvm/branches/branch-0-9-0/engines/gob/draw.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/gob/draw.cpp 2006-06-12 10:55:53 UTC (rev 23060)
+++ scummvm/branches/branch-0-9-0/engines/gob/draw.cpp 2006-06-12 13:54:07 UTC (rev 23061)
@@ -134,7 +134,7 @@
_cursorTimeKey = 0;
- warning("GOB2 Stub! _word_2E8E2");
+// warning("GOB2 Stub! _word_2E8E2");
_word_2E8E2 = 2;
}
Modified: scummvm/branches/branch-0-9-0/engines/gob/game.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/gob/game.cpp 2006-06-12 10:55:53 UTC (rev 23060)
+++ scummvm/branches/branch-0-9-0/engines/gob/game.cpp 2006-06-12 13:54:07 UTC (rev 23061)
@@ -118,12 +118,12 @@
_imdFrameData = 0;
_imdVidBuffer = 0;
- warning("GOB2 Stub! _byte_2FC82, _byte_2FC83, _word_2FC80");
+// warning("GOB2 Stub! _byte_2FC82, _byte_2FC83, _word_2FC80");
_byte_2FC82 = 0;
_byte_2FC83 = 0;
_word_2FC80 = 0;
- warning("GOB2 Stub! _byte_2FC9B, _word_2FC9C, _word_2FC9E, _word_2E51F, _off_2E51B, _off_2E517, _dword_2F2B6");
+// warning("GOB2 Stub! _byte_2FC9B, _word_2FC9C, _word_2FC9E, _word_2E51F, _off_2E51B, _off_2E517, _dword_2F2B6");
_byte_2FC9B = 0;
_word_2FC9C = 0;
_word_2FC9E = 0;
@@ -2041,7 +2041,7 @@
if (imdPtr->verMin & 0x4000) {
// loc_29C4F
- error("GOB2 Stub! loadImdFile, imdPtr->verMin & 0x4000");
+// error("GOB2 Stub! loadImdFile, imdPtr->verMin & 0x4000");
// Sound stuff, I presume...
}
@@ -2083,7 +2083,7 @@
_imdVidBufferSize = imdPtr->vidBufferSize;
if (flags & 0x80) {
imdPtr->verMin |= 0x1000;
- warning("GOB2 Stub! loadImdFile(), flags & 0x80");
+// warning("GOB2 Stub! loadImdFile(), flags & 0x80");
}
return imdPtr;
@@ -2234,7 +2234,7 @@
_word_2FC80 = _vm->_draw->_spritesArray[21]->vidPtr;
else
_word_2FC80 = _vm->_draw->_spritesArray[20]->vidPtr;
- warning("GOB2 Stub! sub_1BC3A(_word_2FC80);");
+// warning("GOB2 Stub! sub_1BC3A(_word_2FC80);");
} else
_vm->_draw->blitInvalidated();
} else
@@ -2370,7 +2370,7 @@
if (byte_31344 != 0) {
if ((var_4 == 0) && (_vm->_global->_soundFlags & 0x14) && (byte_31344 == 2)) { // loc_2A503
var_12 = _vm->_util->getTimeKey();
- warning("GOB2 Stub! viewImd, IMD sound stuff");
+// warning("GOB2 Stub! viewImd, IMD sound stuff");
}
}
var_4 = 0;
@@ -2399,8 +2399,8 @@
continue;
if (!(_vm->_video->_extraMode && (imdPtr->surfDesc->vidMode == 0x13)))
imdRenderFrame(imdPtr);
- else
- warning("GOB2 Stub! viedImd, sub_2C69A(imdPtr);");
+// else
+// warning("GOB2 Stub! viedImd, sub_2C69A(imdPtr);");
}
} else
retVal |= 0x800;
@@ -2621,7 +2621,7 @@
}
int16 Game::sub_2C825(Imd *imdPtr) {
- warning("GOB2 Stub! sub_2C825()");
+// warning("GOB2 Stub! sub_2C825()");
return 0;
}
Modified: scummvm/branches/branch-0-9-0/engines/gob/goblin.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/gob/goblin.cpp 2006-06-12 10:55:53 UTC (rev 23060)
+++ scummvm/branches/branch-0-9-0/engines/gob/goblin.cpp 2006-06-12 13:54:07 UTC (rev 23061)
@@ -147,7 +147,7 @@
for (i = 0; i < 60; i++)
_soundSlots[i] = -1;
- warning("GOB2 Stub! _word_2F9C0, _word_2F9BE, _word_2F9BC, _word_2F9BA, _dword_2F9B6, _dword_2F9B2");
+// warning("GOB2 Stub! _word_2F9C0, _word_2F9BE, _word_2F9BC, _word_2F9BA, _dword_2F9B6, _dword_2F9B2");
_word_2F9C0 = 0;
_word_2F9BE = 0;
_word_2F9BC = 0;
@@ -1892,11 +1892,11 @@
var_C = anim1->field_14;
pass = _vm->_map->getPass(gob1X, gob1Y, 40);
- if ((pass > 17) && (pass < 21))
+/* if ((pass > 17) && (pass < 21))
warning("GOB2 Stub! sub_19AB7(anim0);");
pass = _vm->_map->getPass(gob2X, gob2Y, 40);
if ((pass > 17) && (pass < 21))
- warning("GOB2 Stub! sub_19B45(anim1);");
+ warning("GOB2 Stub! sub_19B45(anim1);");*/
if ((di < 0) || (di > 39) || (si < 0) || (si > 39))
return;
@@ -1912,7 +1912,7 @@
di++;
} else
di--;
- warning("GOB2 Stub! sub_197A6(di (=%d), si (=%d), 0);", si, di);
+// warning("GOB2 Stub! sub_197A6(di (=%d), si (=%d), 0);", si, di);
}
} else {
if (_vm->_map->getPass(di, si, 40) > 17) {
@@ -1925,7 +1925,7 @@
di++;
} else
di--;
- warning("GOB2 Stub! sub_197A6(di (=%d), si (=%d), 0);", si, di);
+// warning("GOB2 Stub! sub_197A6(di (=%d), si (=%d), 0);", si, di);
}
}
if (gob2Y > var_C) {
@@ -1939,7 +1939,7 @@
var_A++;
} else
var_A--;
- warning("GOB2 Stub! sub_197A6(var_A (=%d), var_C (=%d), 1);", var_A, var_C);
+// warning("GOB2 Stub! sub_197A6(var_A (=%d), var_C (=%d), 1);", var_A, var_C);
}
} else {
if (_vm->_map->getPass(var_A, var_C, 40) > 17) {
@@ -1952,7 +1952,7 @@
var_A++;
} else
var_A--;
- warning("GOB2 Stub! sub_197A6(var_A (=%d), var_C (=%d), 1);", var_A, var_C);
+// warning("GOB2 Stub! sub_197A6(var_A (=%d), var_C (=%d), 1);", var_A, var_C);
}
}
}
Modified: scummvm/branches/branch-0-9-0/engines/gob/inter.h
===================================================================
--- scummvm/branches/branch-0-9-0/engines/gob/inter.h 2006-06-12 10:55:53 UTC (rev 23060)
+++ scummvm/branches/branch-0-9-0/engines/gob/inter.h 2006-06-12 13:54:07 UTC (rev 23061)
@@ -310,7 +310,7 @@
virtual const char *getOpcodeGoblinDesc(int i);
virtual void loadMult(void);
- void o2_drawStub(void) { error("Gob2 stub"); }
+ void o2_drawStub(void) { /*error("Gob2 stub");*/ }
void o2_totSub(void);
void o2_switchTotSub(void);
void o2_stub0x54(void);
Modified: scummvm/branches/branch-0-9-0/engines/gob/inter_v2.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/gob/inter_v2.cpp 2006-06-12 10:55:53 UTC (rev 23060)
+++ scummvm/branches/branch-0-9-0/engines/gob/inter_v2.cpp 2006-06-12 13:54:07 UTC (rev 23061)
@@ -753,7 +753,7 @@
_vm->_global->_videoMode = 0x12;
_vm->_video->initPrimary(0xE);
_vm->_global->_videoMode = 0x10;
- warning("GOB2 Stub! Set VGA CRT Maximum Scan Line to 0");
+// warning("GOB2 Stub! Set VGA CRT Maximum Scan Line to 0");
_vm->_draw->_frontSurface->height = 400;
} else {
_vm->_global->_videoMode = videoMode;
@@ -783,10 +783,10 @@
_vm->_game->_word_2E51F = _vm->_global->_primaryHeight - start;
_vm->_game->sub_ADD2();
- if (_vm->_game->_off_2E51B != 0) {
+/* if (_vm->_game->_off_2E51B != 0) {
warning("GOB2 Stub! _vid_setSplit(_vm->_global->_primaryHeight - start);");
warning("GOB2 Stub! _vid_setPixelShift(0, start);");
- }
+ }*/
}
void Inter_v2::o2_stub0x82(void) {
@@ -817,7 +817,7 @@
strcpy(dest, _vm->_global->_inter_resStr);
strcat(dest, ".ITK");
- warning("STUB: Gob2 drawOperation 0x85 (\"%s\")", dest);
+// warning("STUB: Gob2 drawOperation 0x85 (\"%s\")", dest);
_vm->_dataio->openDataFile(dest);
}
@@ -1429,13 +1429,13 @@
if (_vm->_global->_inter_execPtr[i] != 0)
dl = 0;
}
- if (dl != 0) {
+/* if (dl != 0) {
warning("GOB2 Stub! sub_27413");
-/* sub_27413(_draw_frontSurface);
+ sub_27413(_draw_frontSurface);
byte_2E521 = 0;
_vm->_global->_inter_execPtr += 18;
- break;*/
- }
+ break;
+ }*/
// byte_2E521 = 1;
for (i = 0; i < 18; i++, _vm->_global->_inter_execPtr++) {
@@ -1536,9 +1536,9 @@
buf[size] = 0;
}
- if (strcmp(buf, "INSTALL") == 0) {
+/* if (strcmp(buf, "INSTALL") == 0) {
warning("GOB2 Stub! word_2E515 = _inter_variables[0E8h]");
- }
+ }*/
strcat(buf, ".tot");
if (_terminate != 2)
@@ -1900,7 +1900,7 @@
}
void Inter_v2::o2_setPickable(int16 &extraData, int32 *retVarPtr, Goblin::Gob_Object *objDesc) {
- warning("GOB2 Stub! o2_setPickable");
+// warning("GOB2 Stub! o2_setPickable");
}
void Inter_v2::animPalette(void) {
Modified: scummvm/branches/branch-0-9-0/engines/gob/mult_v2.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/gob/mult_v2.cpp 2006-06-12 10:55:53 UTC (rev 23060)
+++ scummvm/branches/branch-0-9-0/engines/gob/mult_v2.cpp 2006-06-12 13:54:07 UTC (rev 23061)
@@ -269,7 +269,7 @@
_multData2->somepointer10 = 0;
if (hbstaticCount) {
- warning("GOB2 Stub! Mult_Data.somepointer09, Mult_Data.somepointer10");
+// warning("GOB2 Stub! Mult_Data.somepointer09, Mult_Data.somepointer10");
size = _vm->_inter->load16();
_multData2->execPtr = _vm->_global->_inter_execPtr;
_vm->_global->_inter_execPtr += size * 2;
@@ -1014,7 +1014,7 @@
// somepointer09 is 14 bytes wide (surely a struct)
int arg0 = _multData2->somepointer09[-_multData2->someKeys[i][_multData2->someKeysIndices[i]].field_2 - 2];
*/
- warning("GOB2 Stub! sub_1CBF8(arg0, arg1, arg2, arg3);");
+// warning("GOB2 Stub! sub_1CBF8(arg0, arg1, arg2, arg3);");
}
}
@@ -1247,7 +1247,7 @@
animData1->animation, 10, *animObj1->pPosX, *animObj1->pPosY, 1);
if (_vm->_scenery->_toRedrawLeft != -12345) {
if (_vm->_global->_pressedKeys[0x36]) {
- warning("GOB2 Stub! word_2F3BF & word_2F3C1; someValueToAddToY & someValueToAddToX, respectively");
+// warning("GOB2 Stub! word_2F3BF & word_2F3C1; someValueToAddToY & someValueToAddToX, respectively");
// draws a rectangle around the region to redraw, why?
_vm->_video->drawLine(_vm->_draw->_frontSurface,
_vm->_scenery->_toRedrawLeft, _vm->_scenery->_toRedrawTop,
Modified: scummvm/branches/branch-0-9-0/engines/gob/music.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/engines/gob/music.cpp 2006-06-12 10:55:53 UTC (rev 23060)
+++ scummvm/branches/branch-0-9-0/engines/gob/music.cpp 2006-06-12 13:54:07 UTC (rev 23061)
@@ -354,10 +354,10 @@
setKey(channel, note, true, false);
break;
case 0x10:
- warning("GOB2 Stub! ADL command 0x10");
+// warning("GOB2 Stub! ADL command 0x10");
break;
case 0x50:
- warning("GOB2 Stub! ADL command 0x50");
+// warning("GOB2 Stub! ADL command 0x50");
break;
// Note on
case 0x90:
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