[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.117,2.118 script_v6.cpp,1.205,1.206 script_v8.cpp,2.199,2.200
Pawel Kolodziejski
aquadran at users.sourceforge.net
Sun Nov 9 14:13:11 CET 2003
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv7950
Modified Files:
intern.h script_v6.cpp script_v8.cpp
Log Message:
renamed some opcodes and added sobopcode comments
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.117
retrieving revision 2.118
diff -u -d -r2.117 -r2.118
--- intern.h 8 Nov 2003 21:59:32 -0000 2.117
+++ intern.h 9 Nov 2003 22:12:16 -0000 2.118
@@ -392,14 +392,14 @@
void o6_wordVarDec();
void o6_byteArrayDec();
void o6_wordArrayDec();
- void o6_jumpTrue();
- void o6_jumpFalse();
+ void o6_if();
+ void o6_ifNot();
void o6_jump();
- void o6_startScriptEx();
void o6_startScript();
- void o6_startObjectEx();
- void o6_setObjectState();
- void o6_setObjectXY();
+ void o6_startScriptQuick();
+ void o6_startObject();
+ void o6_drawObject();
+ void o6_drawObjectAt();
void o6_stopObjectCode();
void o6_endCutscene();
void o6_cutscene();
@@ -407,7 +407,7 @@
void o6_freezeUnfreeze();
void o6_cursorCommand();
void o6_breakHere();
- void o6_ifClassOfIs();
+ void o6_getClass();
void o6_setClass();
void o6_getState();
void o6_setState();
@@ -424,7 +424,7 @@
void o6_stopScript();
void o6_walkActorToObj();
void o6_walkActorTo();
- void o6_putActorInRoom();
+ void o6_putActorAtXY();
void o6_putActorAtObject();
void o6_faceActor();
void o6_animateActor();
@@ -486,8 +486,8 @@
void o6_dim();
void o6_dummy();
void o6_startObjectQuick();
- void o6_startScriptQuick();
- void o6_dim2();
+ void o6_startScriptQuick2();
+ void o6_dim2dim();
void o6_abs();
void o6_distObjectObject();
void o6_distObjectPt();
@@ -579,7 +579,7 @@
void o8_wait();
void o8_dim();
- void o8_dim2();
+ void o8_dim2dim();
void o8_arrayOps();
void o8_blastText();
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- script_v6.cpp 8 Nov 2003 03:33:21 -0000 1.205
+++ script_v6.cpp 9 Nov 2003 22:12:16 -0000 1.206
@@ -162,14 +162,14 @@
OPCODE(o6_byteArrayDec),
OPCODE(o6_wordArrayDec),
/* 5C */
- OPCODE(o6_jumpTrue),
- OPCODE(o6_jumpFalse),
- OPCODE(o6_startScriptEx),
+ OPCODE(o6_if),
+ OPCODE(o6_ifNot),
OPCODE(o6_startScript),
+ OPCODE(o6_startScriptQuick),
/* 60 */
[...964 lines suppressed...]
_string[m].overhead = false;
break;
- case 72:
+ case 72: // SO_OVERHEAD
_string[m].overhead = true;
_string[m].no_talk_anim = false;
break;
- case 73:
+ case 73: // SO_SAY_VOICE
error("decodeParseString: case 73");
break;
- case 74:
+ case 74: // SO_MUMBLE
_string[m].no_talk_anim = true;
break;
- case 75:
+ case 75: // SO_TEXTSTRING
_messagePtr = translateTextAndPlaySpeech(_scriptPointer);
_scriptPointer += resStrLen(_scriptPointer)+ 1;
Index: script_v8.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v8.cpp,v
retrieving revision 2.199
retrieving revision 2.200
diff -u -d -r2.199 -r2.200
--- script_v8.cpp 3 Oct 2003 18:33:55 -0000 2.199
+++ script_v8.cpp 9 Nov 2003 22:12:16 -0000 2.200
@@ -165,8 +165,8 @@
OPCODE(o6_invalid),
OPCODE(o6_invalid),
/* 64 */
- OPCODE(o6_jumpTrue),
- OPCODE(o6_jumpFalse),
+ OPCODE(o6_if),
+ OPCODE(o6_ifNot),
OPCODE(o6_jump),
OPCODE(o6_breakHere),
/* 68 */
@@ -185,20 +185,20 @@
OPCODE(o6_wordArrayInc),
OPCODE(o6_wordArrayDec),
/* 74 */
- OPCODE(o8_dim2),
+ OPCODE(o8_dim2dim),
OPCODE(o6_wordArrayIndexedWrite),
OPCODE(o8_arrayOps),
OPCODE(o6_invalid),
/* 78 */
OPCODE(o6_invalid),
- OPCODE(o6_startScriptEx),
OPCODE(o6_startScript),
+ OPCODE(o6_startScriptQuick),
OPCODE(o6_stopObjectCode),
/* 7C */
OPCODE(o6_stopScript),
OPCODE(o6_jumpToScript),
OPCODE(o6_dummy), // O_RETURN boils down to a NOP
- OPCODE(o6_startObjectEx),
+ OPCODE(o6_startObject),
/* 80 */
OPCODE(o6_stopObjectScript),
OPCODE(o6_cutscene),
@@ -241,7 +241,7 @@
OPCODE(o6_walkActorToObj),
/* A0 */
OPCODE(o6_walkActorTo),
- OPCODE(o6_putActorInRoom),
+ OPCODE(o6_putActorAtXY),
OPCODE(o6_putActorAtObject),
OPCODE(o6_faceActor),
/* A4 */
@@ -290,7 +290,7 @@
OPCODE(o6_invalid),
OPCODE(o6_invalid),
/* C8 */
- OPCODE(o6_startScriptQuick), // FIXME: are these really the "quick" (=recursive) variants,
+ OPCODE(o6_startScriptQuick2), // FIXME: are these really the "quick" (=recursive) variants,
OPCODE(o6_startObjectQuick), // or aren't these maybe supposed to be the "plain" versions, too?
OPCODE(o6_pickOneOf),
OPCODE(o6_pickOneOfDefault),
@@ -300,7 +300,7 @@
OPCODE(o6_getRandomNumber),
OPCODE(o6_getRandomNumberRange),
/* D0 */
- OPCODE(o6_ifClassOfIs),
+ OPCODE(o6_getClass),
OPCODE(o6_getState),
OPCODE(o6_getOwner),
OPCODE(o6_isScriptRunning),
@@ -458,12 +458,12 @@
b = fetchScriptByte();
switch (b) {
- case 0xC8:
+ case 0xC8: // SO_PRINT_BASEOP
setStringVars(m);
if (n)
_actorToPrintStrFor = pop();
break;
- case 0xC9:
+ case 0xC9: // SO_PRINT_END
_string[m].t_xpos = _string[m].xpos;
_string[m].t_ypos = _string[m].ypos;
_string[m].t_center = _string[m].center;
@@ -473,33 +473,33 @@
_string[m].t_color = _string[m].color;
_string[m].t_charset = _string[m].charset;
break;
- case 0xCA:
+ case 0xCA: // SO_PRINT_AT
_string[m].ypos = pop();
_string[m].xpos = pop();
_string[m].overhead = false;
break;
- case 0xCB:
+ case 0xCB: // SO_PRINT_COLOR
_string[m].color = pop();
break;
- case 0xCC:
+ case 0xCC: // SO_PRINT_CENTER
_string[m].center = true;
_string[m].overhead = false;
break;
case 0xCD: // SO_PRINT_CHARSET Set print character set
_string[m].charset = pop();
break;
- case 0xCE:
+ case 0xCE: // SO_PRINT_LEFT
_string[m].center = false;
_string[m].overhead = false;
break;
- case 0xCF:
+ case 0xCF: // SO_PRINT_OVERHEAD
_string[m].overhead = true;
_string[m].no_talk_anim = false;
break;
case 0xD0: // SO_PRINT_MUMBLE
_string[m].no_talk_anim = true;
break;
- case 0xD1:
+ case 0xD1: // SO_PRINT_STRING
_messagePtr = translateTextAndPlaySpeech(_scriptPointer);
_scriptPointer += resStrLen(_scriptPointer)+ 1;
@@ -610,7 +610,7 @@
}
}
-void ScummEngine_v8::o8_dim2() {
+void ScummEngine_v8::o8_dim2dim() {
byte subOp = fetchScriptByte();
int array = fetchScriptWord(), a, b;
@@ -629,7 +629,7 @@
nukeArray(array);
break;
default:
- error("o8_dim2: default case 0x%x", subOp);
+ error("o8_dim2dim: default case 0x%x", subOp);
}
}
@@ -732,7 +732,7 @@
case 0xE6: // SO_CURSOR_TRANSPARENT Set cursor transparent color
makeCursorColorTransparent(pop());
break;
- case 0xE7: { // SO_CHARSET_SET
+ case 0xE7: { // SO_CHARSET_SET
int charset = pop();
warning("Set userface charset to %d", charset);
// loadCharset(charset);
@@ -991,10 +991,10 @@
a->scalex = a->scaley = pop();
a->needRedraw = true;
break;
- case 0x74: // SO_ACTOR_NEVER_ZCLIP ?
+ case 0x74: // SO_ACTOR_NEVER_ZCLIP
a->forceClip = 0;
break;
- case 0x75: // SO_ACTOR_ALWAYS_ZCLIP ?
+ case 0x75: // SO_ACTOR_ALWAYS_ZCLIP
a->forceClip = pop();
// V8 uses 255 where we used to use 100
if (a->forceClip == 255)
More information about the Scummvm-git-logs
mailing list