[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.188,2.189 script_v6.cpp,1.384,1.385 script_v72he.cpp,2.4,2.5
Travis Howell
kirben at users.sourceforge.net
Mon Aug 23 07:13:01 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.187,2.188 script_v6.cpp,1.383,1.384 script_v72he.cpp,2.3,2.4 script_v7he.cpp,2.43,2.44
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.5,2.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2683/scumm
Modified Files:
intern.h script_v6.cpp script_v72he.cpp
Log Message:
Another stub
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.188
retrieving revision 2.189
diff -u -d -r2.188 -r2.189
--- intern.h 23 Aug 2004 14:03:54 -0000 2.188
+++ intern.h 23 Aug 2004 14:11:53 -0000 2.189
@@ -660,12 +660,13 @@
void o72_objectY();
void o72_startScript();
void o72_startObject();
+ void o72_drawObject();
+ void o72_unknown62();
void o72_unknown63();
void o72_arrayOps();
void o72_dimArray();
void o72_dim2dimArray();
void o72_jumpToScript();
- void o72_drawObject();
void o72_stringLen();
void o72_readINI();
void o72_unknownF4();
Index: script_v6.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
retrieving revision 1.384
retrieving revision 1.385
diff -u -d -r1.384 -r1.385
--- script_v6.cpp 23 Aug 2004 14:03:54 -0000 1.384
+++ script_v6.cpp 23 Aug 2004 14:11:53 -0000 1.385
@@ -597,7 +597,7 @@
}
void ScummEngine_v6::o6_pushByteVar() {
- push(readVar(fetchScriptWord()));
+ push(readVar(fetchScriptByte()));
}
void ScummEngine_v6::o6_pushWordVar() {
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- script_v72he.cpp 23 Aug 2004 14:03:54 -0000 2.4
+++ script_v72he.cpp 23 Aug 2004 14:11:53 -0000 2.5
@@ -167,8 +167,8 @@
OPCODE(o6_startScriptQuick),
/* 60 */
OPCODE(o72_startObject),
- OPCODE(o6_drawObject),
- OPCODE(o6_drawObjectAt),
+ OPCODE(o72_drawObject),
+ OPCODE(o72_unknown62),
OPCODE(o72_unknown63),
/* 64 */
OPCODE(o6_invalid),
@@ -437,6 +437,51 @@
runObjectScript(script, entryp, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
}
+void ScummEngine_v72he::o72_drawObject() {
+ int subOp = fetchScriptByte();
+ int state = 0, y = -1, x = -1;
+
+ switch (subOp) {
+ case 62:
+ state = pop();
+ y = pop();
+ x = pop();
+ break;
+ case 63:
+ state = pop();
+ if (state == 0)
+ state = 1;
+ break;
+ case 65:
+ state = 1;
+ y = pop();
+ x = pop();
+ default:
+ warning("o72_drawObject: default case %d", subOp);
+ }
+
+ int object = pop();
+ int objnum = getObjectIndex(object);
+ if (objnum == -1)
+ return;
+
+ if (y != -1 && x != -1) {
+ _objs[objnum].x_pos = x * 8;
+ _objs[objnum].y_pos = y * 8;
+ }
+
+ if (state != -1) {
+ addObjectToDrawQue(objnum);
+ putState(object, state);
+ }
+}
+
+void ScummEngine_v72he::o72_unknown62() {
+ int a = pop();
+ // unknown62(a, 0, 0, 4);
+ warning("o72_unknown62 stub (%d)", a);
+}
+
void ScummEngine_v72he::o72_unknown63() {
int a = fetchScriptByte();
warning("o72_unknown63 stub (%d)", a);
@@ -559,45 +604,6 @@
runScript(script, (flags == 199 || flags == 200), (flags == 195 || flags == 200), args);
}
-void ScummEngine_v72he::o72_drawObject() {
- int subOp = fetchScriptByte();
- int state = 0, y = -1, x = -1;
-
- switch (subOp) {
- case 62:
- state = pop();
- y = pop();
- x = pop();
- break;
- case 63:
- state = pop();
- if (state == 0)
- state = 1;
- break;
- case 65:
- state = 1;
- y = pop();
- x = pop();
- default:
- warning("o72_drawObject: default case %d", subOp);
- }
-
- int object = pop();
- int objnum = getObjectIndex(object);
- if (objnum == -1)
- return;
-
- if (y != -1 && x != -1) {
- _objs[objnum].x_pos = x * 8;
- _objs[objnum].y_pos = y * 8;
- }
-
- if (state != -1) {
- addObjectToDrawQue(objnum);
- putState(object, state);
- }
-}
-
void ScummEngine_v72he::o72_stringLen() {
int a, len;
byte *addr;
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.187,2.188 script_v6.cpp,1.383,1.384 script_v72he.cpp,2.3,2.4 script_v7he.cpp,2.43,2.44
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.5,2.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list