[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.18,2.19 resource.cpp,1.40,1.41 script.cpp,1.25,1.26 script_v8.cpp,2.39,2.40
Max Horn
fingolfin at users.sourceforge.net
Wed Dec 25 11:07:02 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21625
Modified Files:
intern.h resource.cpp script.cpp script_v8.cpp
Log Message:
cleanup
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.18
retrieving revision 2.19
diff -u -d -r2.18 -r2.19
--- intern.h 25 Dec 2002 18:47:46 -0000 2.18
+++ intern.h 25 Dec 2002 19:06:31 -0000 2.19
@@ -432,8 +432,8 @@
void o8_soundKludge();
void o8_system();
- void o8_kludge();
- void o8_kludge2();
+ void o6_kernelSetFunctions();
+ void o6_kernelGetFunctions();
void o8_getObjectImageX();
void o8_getObjectImageY();
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- resource.cpp 24 Dec 2002 16:10:30 -0000 1.40
+++ resource.cpp 25 Dec 2002 19:06:31 -0000 1.41
@@ -106,7 +106,6 @@
return;
if (_features & GF_EXTERNAL_CHARSET && room >= roomlimit)
return;
- printf("Reading room offsets from '%s'\n", buf);
readRoomsOffsets();
_fileOffset = _roomFileOffsets[room];
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- script.cpp 25 Dec 2002 14:46:39 -0000 1.25
+++ script.cpp 25 Dec 2002 19:06:31 -0000 1.26
@@ -131,9 +131,8 @@
ss = &vm.slot[1];
for (i = 1; i < NUM_SCRIPT_SLOT; i++, ss++) {
- if (script == ss->number && (ss->where == WIO_ROOM ||
- ss->where == WIO_INVENTORY || ss->where == WIO_FLOBJECT)
- && ss->status != ssDead) {
+ if (script == ss->number && ss->status != ssDead &&
+ (ss->where == WIO_ROOM || ss->where == WIO_INVENTORY || ss->where == WIO_FLOBJECT)) {
if (ss->cutsceneOverride)
error("Object %d stopped with active cutscene/override", script);
ss->number = 0;
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.39
retrieving revision 2.40
diff -u -d -r2.39 -r2.40
--- script_v8.cpp 25 Dec 2002 18:47:46 -0000 2.39
+++ script_v8.cpp 25 Dec 2002 19:06:31 -0000 2.40
@@ -288,7 +288,7 @@
/* B8 */
OPCODE(o6_invalid),
OPCODE(o6_invalid),
- OPCODE(o8_kludge),
+ OPCODE(o6_kernelSetFunctions),
OPCODE(o6_invalid),
/* BC */
OPCODE(o6_invalid),
@@ -326,7 +326,7 @@
OPCODE(o6_abs),
OPCODE(o6_invalid),
/* D8 */
- OPCODE(o8_kludge2),
+ OPCODE(o6_kernelGetFunctions),
OPCODE(o6_invalid),
OPCODE(o6_getVerbEntrypoint),
OPCODE(o6_getActorFromXY),
@@ -1164,72 +1164,72 @@
// }
}
-void Scumm_v8::o8_kludge()
+void Scumm_v8::o6_kernelSetFunctions()
{
// TODO
int args[30];
int len = getStackList(args, sizeof(args) / sizeof(args[0]));
switch (args[0]) {
- case 11:
- warning("o8_kludge: ObjectsFindObjectRelNum(%d)", args[1]);
+ case 11: // lockObject
+ warning("o6_kernelSetFunctions: lockObject(%d)", args[1]);
break;
- case 12:
- warning("o8_kludge: ObjectsFindObjectRelNum(%d)", args[1]);
+ case 12: // unlockObject
+ warning("o6_kernelSetFunctions: unlockObject(%d)", args[1]);
break;
- case 13:
- derefActorSafe(args[1], "o8_kludge:13")->remapActorPalette(args[2], args[3], args[4], -1);
+ case 13: // remapCostume
+ derefActorSafe(args[1], "o6_kernelSetFunctions:remapCostume")->remapActorPalette(args[2], args[3], args[4], -1);
break;
- case 14:
- derefActorSafe(args[1], "o8_kludge:14")->remapActorPalette(args[2], args[3], args[4], args[5]);
+ case 14: // remapCostumeInsert
+ derefActorSafe(args[1], "o6_kernelSetFunctions:remapCostumeInsert")->remapActorPalette(args[2], args[3], args[4], args[5]);
break;
- case 15:
+ case 15: // setVideoFrameRate
// not used anymore (was smush frame rate)
break;
- case 20:
+ case 20: // setBoxSlot
setBoxScale(args[1], args[2]);
break;
- case 21:
- warning("o8_kludge: WalkboxSetScaleSlot(%d, %d, %d, %d, %d, %d, %d)", args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
+ case 21: // setScaleSlot
+ warning("o6_kernelSetFunctions: setScaleSlot(%d, %d, %d, %d, %d, %d, %d)", args[1], args[2], args[3], args[4], args[5], args[6], args[7]);
break;
- case 22:
-// warning("o8_kludge: BannerSetBannerColor(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
+ case 22: // setBannerColors
+// warning("o6_kernelSetFunctions: setBannerColors(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
break;
- case 23:
- warning("o8_kludge: ChoreSetActorChoreLimbFrame(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
+ case 23: // setActorChoreLimbFrame
+ warning("o6_kernelSetFunctions: setActorChoreLimbFrame(%d, %d, %d, %d)", args[1], args[2], args[3], args[4]);
break;
- case 24:
- warning("o8_kludge: opcode 24 ()");
+ case 24: // clearTextQueue
+ warning("o6_kernelSetFunctions: clearTextQueue()");
break;
- case 25:
- warning("o8_kludge: opcode 25 (%d, %d)", args[1], args[2]);
+ case 25: // saveGameWrite
+ warning("o6_kernelSetFunctions: saveGameWrite(%d, %d)", args[1], args[2]);
break;
- case 26:
- warning("o8_kludge: opcode 26 (%d, %d)", args[1], args[2]);
+ case 26: // saveGameRead
+ warning("o6_kernelSetFunctions: saveGameRead(%d, %d)", args[1], args[2]);
break;
- case 27:
- warning("o8_kludge: opcode 27 (%d)", args[1]);
+ case 27: // saveGameReadName
+ warning("o6_kernelSetFunctions: saveGameReadName(%d)", args[1]);
break;
- case 28:
- warning("o8_kludge: StampShotEnqueue(%d, %d, %d, %d, %d, %d)", args[1], args[2], args[3], args[4], args[5], args[6]);
+ case 28: // saveGameStampScreenshot
+ warning("o6_kernelSetFunctions: saveGameStampScreenshot(%d, %d, %d, %d, %d, %d)", args[1], args[2], args[3], args[4], args[5], args[6]);
break;
- case 29:
- warning("o8_kludge: opcode 29 (%d, %d)", args[1], args[2]);
+ case 29: // setKeyScript
+ warning("o6_kernelSetFunctions: setKeyScript(%d, %d)", args[1], args[2]);
break;
- case 30:
- warning("o8_kludge: opcode 30 ()");
+ case 30: // killAllScriptsButMe
+ warning("o6_kernelSetFunctions: killAllScriptsButMe()");
break;
- case 31:
- warning("o8_kludge: opcode 31 ()");
+ case 31: // stopAllVideo
+ warning("o6_kernelSetFunctions: stopAllVideo()");
break;
- case 32:
- warning("o8_kludge: opcode 32 (%d, %d)", args[1], args[2]);
+ case 32: // writeRegistryValue
+ warning("o6_kernelSetFunctions: writeRegistryValue(%d, %d)", args[1], args[2]);
break;
- case 33:
- warning("o8_kludge: opcode 33 (%d, %d)", args[1], args[2]);
+ case 33: // paletteSetIntensity
+ warning("o6_kernelSetFunctions: paletteSetIntensity(%d, %d)", args[1], args[2]);
break;
- case 34:
- warning("o8_kludge: opcode 34 ()");
+ case 34: // queryQuit
+ warning("o6_kernelSetFunctions: queryQuit()");
break;
case 108:
setupShadowPalette(args[1], args[2], args[3], args[4], args[5], args[6]);
@@ -1237,6 +1237,12 @@
case 109:
setupShadowPalette(0, args[1], args[2], args[3], args[4], args[5]);
break;
+ case 115: // getWalkBoxAt
+ // TODO
+ break;
+ case 116: // isPointInBox
+ // TODO
+ break;
case 118:
enqueueObject(args[1], args[2], args[3], args[4], args[5], args[6], args[7], args[8], 3);
break;
@@ -1245,11 +1251,11 @@
break;
default:
- warning("o8_kludge: default case (len = %d)", len);
+ warning("o6_kernelSetFunctions: default case (len = %d)", len);
}
}
-void Scumm_v8::o8_kludge2()
+void Scumm_v8::o6_kernelGetFunctions()
{
// TODO
int args[30];
@@ -1291,7 +1297,7 @@
}
break;
default:
- error("o8_kludge2: default case (len = %d)", len);
+ error("o6_kernelGetFunctions: default case (len = %d)", len);
}
}
More information about the Scummvm-git-logs
mailing list