[Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.42,1.43
Max Horn
fingolfin at users.sourceforge.net
Mon Dec 23 06:16:05 CET 2002
- Previous message: [Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.41,1.42
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.37,1.38 actor.h,1.7,1.8 saveload.cpp,1.35,1.36 script_v6.cpp,1.13,1.14 script_v8.cpp,2.7,2.8 string.cpp,1.58,1.59
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/tools
In directory sc8-pr-cvs1:/tmp/cvs-serv5935
Modified Files:
descumm6.cpp
Log Message:
some more var names; added actorSet opcode (with quite some guesswork)
Index: descumm6.cpp
===================================================================
RCS file: /cvsroot/scummvm/tools/descumm6.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- descumm6.cpp 23 Dec 2002 13:39:48 -0000 1.42
+++ descumm6.cpp 23 Dec 2002 14:15:48 -0000 1.43
@@ -449,7 +449,7 @@
"camera_dest_y",
NULL,
NULL,
- NULL,
+ "message_stuff?",
/* 16 */
NULL,
NULL,
@@ -461,31 +461,31 @@
NULL,
NULL,
/* 24 */
- NULL,
- NULL,
- NULL,
- NULL,
+ "timedate_year?",
+ "timedate_month?",
+ "timedate_day?",
+ "timedate_hour?",
/* 28 */
- NULL,
- NULL,
- NULL,
- NULL,
+ "timedate_minute?",
+ "timedate_second?",
+ "override_hit",
+ "current_room",
/* 32 */
NULL,
NULL,
NULL,
NULL,
- /* XXX */
- NULL,
- NULL,
+ /* 36 */
NULL,
NULL,
- /* XXX */
NULL,
+ "voice_text_mode",
+ /* 40 */
NULL,
NULL,
+ "current_disk_number",
NULL,
- /* XXX */
+ /* 44 */
NULL,
NULL,
NULL,
@@ -494,11 +494,11 @@
NULL,
NULL,
NULL,
- NULL,
+ "script_before_roomentry",
/* 52 */
- NULL,
- NULL,
- NULL,
+ "script_after_roomentry",
+ "script_before_roomexit",
+ "script_after_roomexit",
NULL,
/* 56 */
"sentence_script",
@@ -771,13 +771,13 @@
if ((s = getVarName(var)) != NULL)
where = strecpy(where, s);
else
- where += sprintf(where, "var-%ld", se->data & 0xFFFFFFF);
+ where += sprintf(where, "var%ld", se->data & 0xFFFFFFF);
} else if (se->data & 0x80000000) {
- where += sprintf(where, "bitvar-%ld", se->data & 0x7FFFFFFF);
+ where += sprintf(where, "bitvar%ld", se->data & 0x7FFFFFFF);
} else if (se->data & 0x40000000) {
- where += sprintf(where, "localvar-%ld", se->data & 0xFFFFFFF);
+ where += sprintf(where, "localvar%ld", se->data & 0xFFFFFFF);
} else {
- where += sprintf(where, "?var?-%ld", se->data);
+ where += sprintf(where, "?var?%ld", se->data);
}
} else {
if (!(se->data & 0xF000)) {
@@ -785,13 +785,13 @@
if ((s = getVarName(var)) != NULL)
where = strecpy(where, s);
else
- where += sprintf(where, "var-%ld", se->data & 0xFFF);
+ where += sprintf(where, "var%ld", se->data & 0xFFF);
} else if (se->data & 0x8000) {
- where += sprintf(where, "bitvar-%ld", se->data & 0x7FFF);
+ where += sprintf(where, "bitvar%ld", se->data & 0x7FFF);
} else if (se->data & 0x4000) {
- where += sprintf(where, "localvar-%ld", se->data & 0xFFF);
+ where += sprintf(where, "localvar%ld", se->data & 0xFFF);
} else {
- where += sprintf(where, "?var?-%ld", se->data);
+ where += sprintf(where, "?var?%ld", se->data);
}
}
break;
@@ -1333,7 +1333,6 @@
case 0x6F:
addVar(get_word(), -1);
break;
-
case 0x70:
// FIXME - is this correct?!?
ext("x" "dim\0"
@@ -1367,22 +1366,11 @@
ext("lp|startScriptQuick");
break;
- case 0x9C:
- ext("x" "cursorCommand\0"
- "\xDC|cursorOn,"
- "\xDD|cursorOff,"
- "\xDE|userPutOn,"
- "\xDF|userPutOff,"
- "\xE0|softCursorOn,"
- "\xE1|softCursorOff,"
- "\xE2|softUserputOn,"
- "\xE3|softUserputOff,"
- "\xE4pp|setCursorImg,"
- "\xE5pp|setCursorHotspot,"
- "\xE6p|makeCursorColorTransparent,"
- "\xE7p|initCharset,"
- "\xE8l|charsetColors");
+ case 0x89:
+ // FIXME - is this correct?!?
+ ext("lp|setClassOf?");
break;
+
case 0x95:
ext("m" "printDebug_\0"
"x" "printDebug\0"
@@ -1416,6 +1404,30 @@
);
break;
+ case 0x9C:
+ ext("x" "cursorCommand\0"
+ "\xDC|cursorOn,"
+ "\xDD|cursorOff,"
+ "\xDE|userPutOn,"
+ "\xDF|userPutOff,"
+ "\xE0|softCursorOn,"
+ "\xE1|softCursorOff,"
+ "\xE2|softUserputOn,"
+ "\xE3|softUserputOff,"
+ "\xE4pp|setCursorImg,"
+ "\xE5pp|setCursorHotspot,"
+ "\xE6p|makeCursorColorTransparent,"
+ "\xE7p|initCharset,"
+ "\xE8l|charsetColors");
+ break;
+
+ case 0xA1:
+ ext("pppp|putActorInRoom");
+ break;
+ case 0xA2:
+ ext("ppp|putActorAtObject");
+ break;
+
case 0xAA:
ext("x" "resourceRoutines\0"
"\x3Cp|loadCharset,"
@@ -1454,6 +1466,48 @@
"\x5F|setRoomSaturation"
);
break;
+ case 0xAC:
+ // Note: these are guesses and may partially be wrong
+ ext("x" "actorOps\0"
+ "\x64p|setActorCostume,"
+ "\x65pp|setActorWalkSpeed,"
+ "\x67|setActorDefAnim,"
+ "\x68p|setActorInitFrame,"
+ "\x69pp|setActorTalkFrame,"
+ "\x6Ap|setActorWalkFrame,"
+ "\x6Bp|setActorStandFrame,"
+ "\x6C|setActorAnimSpeed,"
+ "\x6D|setActorDefault," // = initActorLittle ?
+ "\x6E|setActorElevation,"
+ "\x6Fpp|setActorPalette,"
+ "\x70p|setActorTalkColor,"
+ "\x71s|setActorName,"
+ "\x72p|setActorWidth,"
+ "\x73p|setActorScale,"
+ "\x74|setActorNeverZClip?,"
+ "\x75p|setActorAlwayZClip?,"
+ "\x76|setActorIgnoreBoxes,"
+ "\x77|setActorFollowBoxes,"
+ "\x78p|actorSpecialDraw,"
+ "\x79pp|setActorTalkPos,"
+ "\x7Ap|initActor," // = setCurActor ?
+ "\x7Bp|setActorAnimVar,"
+ "\x7C|setActorIgnoreTurnsOn,"
+ "\x7D|setActorIgnoreTurnsOff,"
+ "\x7E|newActor,"
+ "\x7Fp|setActorLayer,"
+ "\x80|setActorStanding,"
+ "\x81p|setActorDirection,"
+ "\x82p|actorTurnToDirection,"
+ "\x83p|setActorWalkScript,"
+ "\x84p|setTalkScript,"
+ "\x85|freezeActor,"
+ "\x86|unfreezeActor,"
+ "\x87p|setActorVolume,"
+ "\x88p|setActorFrequency,"
+ "\x89p|setActorPan"
+ );
+ break;
case 0xAE:
ext("x" "verbOps\0"
@@ -1884,8 +1938,8 @@
"\x62|setActorShadowMode,"
"\x63pp|setActorTalkPos,"
"\xC6p|setActorAnimVar,"
- "\xD7|setActorNew3On,"
- "\xD8|setActorNew3Off,"
+ "\xD7|setActorIgnoreTurnsOn,"
+ "\xD8|setActorIgnoreTurnsOff,"
"\xD9|initActorLittle,"
"\xE3p|setActorLayer,"
"\xE4p|setActorWalkScript,"
- Previous message: [Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.41,1.42
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm actor.cpp,1.37,1.38 actor.h,1.7,1.8 saveload.cpp,1.35,1.36 script_v6.cpp,1.13,1.14 script_v8.cpp,2.7,2.8 string.cpp,1.58,1.59
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list