[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.331,2.332 script_v100he.cpp,2.42,2.43
kirben
kirben at users.sourceforge.net
Tue Feb 8 03:19:54 CET 2005
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19531/scumm
Modified Files:
intern.h script_v100he.cpp
Log Message:
Minor updates to HE100
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.331
retrieving revision 2.332
diff -u -d -r2.331 -r2.332
--- intern.h 2 Feb 2005 12:14:34 -0000 2.331
+++ intern.h 8 Feb 2005 11:17:35 -0000 2.332
@@ -950,7 +950,7 @@
void o100_getPaletteData();
void o100_readFile();
void o100_unknown25();
- void o100_unknown29();
+ void o100_getWizData();
};
class ScummEngine_v7 : public ScummEngine_v6 {
Index: script_v100he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v100he.cpp,v
retrieving revision 2.42
retrieving revision 2.43
diff -u -d -r2.42 -r2.43
--- script_v100he.cpp 2 Feb 2005 12:05:00 -0000 2.42
+++ script_v100he.cpp 8 Feb 2005 11:17:36 -0000 2.43
@@ -147,7 +147,7 @@
OPCODE(o6_pop),
/* 54 */
OPCODE(o6_printDebug),
- OPCODE(o6_invalid),
+ OPCODE(o72_printWizImage),
OPCODE(o6_printLine),
OPCODE(o6_printSystem),
/* 58 */
@@ -273,7 +273,7 @@
/* B8 */
OPCODE(o100_unknown27),
OPCODE(o6_invalid),
- OPCODE(o100_unknown29),
+ OPCODE(o100_getWizData),
OPCODE(o6_isActorInBox),
/* BC */
OPCODE(o6_isAnyOf),
@@ -328,7 +328,7 @@
/* E4 */
OPCODE(o70_getStringLen),
OPCODE(o70_getStringLenForWidth),
- OPCODE(o6_invalid),
+ OPCODE(o80_stringToInt),
OPCODE(o70_getCharIndexInString),
/* E8 */
OPCODE(o70_getStringWidth),
@@ -1580,10 +1580,10 @@
case 67:
clearDrawObjectQueue();
break;
- case 72:
+ case 71:
shutDown();
break;
- case 73: // SO_RESTART
+ case 72: // SO_RESTART
restart();
break;
case 75:
@@ -1792,7 +1792,7 @@
debug(1,"o100_unknown27 stub (%d)", subOp);
}
-void ScummEngine_v100he::o100_unknown29() {
+void ScummEngine_v100he::o100_getWizData() {
int state, resId;
int32 w, h;
int16 x, y;
@@ -1802,24 +1802,22 @@
switch (subOp) {
case 0:
- pop();
- pop();
- pop();
- pop();
- push(0);
- warning("o100_unknown29() case 0 unhandled");
+ y = pop();
+ x = pop();
+ state = pop();
+ resId = pop();
+ push(getWizPixelColor(rtImage, resId, state, x, y, 0));
break;
case 6:
resId = pop();
push(getWizImageStates(resId));
break;
case 13:
- pop();
- pop();
- pop();
- pop();
- push(0);
- warning("o100_unknown29() case 13 unhandled");
+ y = pop();
+ x = pop();
+ state = pop();
+ resId = pop();
+ push(isWizPixelNonTransparent(rtImage, resId, state, x, y, 0));
break;
case 19:
state = pop();
@@ -1832,7 +1830,7 @@
pop();
pop();
push(0);
- warning("o100_unknown29() case 34 unhandled");
+ warning("o100_getWizData() case 34 unhandled");
break;
case 64:
state = pop();
@@ -1856,20 +1854,24 @@
pop();
pop();
push(0);
- warning("o100_unknown29() case 111 unhandled");
+ warning("o100_getWizData() case 111 unhandled");
break;
case 112:
- pop();
- pop();
- pop();
- pop();
- pop();
- pop();
- push(0);
- warning("o100_unknown29() case 112 unhandled");
+ h = pop();
+ w = pop();
+ y = pop();
+ x = pop();
+ state = pop();
+ resId = pop();
+ if (x == -1 && y == -1 && w == -1 && h == -1) {
+ getWizImageDim(resId, state, w, h);
+ x = 0;
+ y = 0;
+ }
+ push(computeWizHistogram(resId, state, x, y, w, h));
break;
default:
- error("o100_unknown29: Unknown case %d", subOp);
+ error("o100_getWizData: Unknown case %d", subOp);
}
}
@@ -2052,6 +2054,7 @@
byte name[1024];
byte b = fetchScriptByte();
+ printf("decodeParseString %d\n", b);
switch (b) {
case 6: // SO_AT
More information about the Scummvm-git-logs
mailing list