[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.190,2.191 script_v72he.cpp,2.10,2.11
Travis Howell
kirben at users.sourceforge.net
Tue Aug 24 08:26:08 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8200/scumm
Modified Files:
intern.h script_v72he.cpp
Log Message:
That should not have been removed
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.190
retrieving revision 2.191
diff -u -d -r2.190 -r2.191
--- intern.h 24 Aug 2004 11:17:27 -0000 2.190
+++ intern.h 24 Aug 2004 15:25:32 -0000 2.191
@@ -656,6 +656,8 @@
/* Version 7 script opcodes */
void o72_getString();
void o72_compareStackList();
+ void o72_objectX();
+ void o72_objectY();
void o72_startScript();
void o72_startObject();
void o72_drawObject();
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.10
retrieving revision 2.11
diff -u -d -r2.10 -r2.11
--- script_v72he.cpp 24 Aug 2004 15:08:26 -0000 2.10
+++ script_v72he.cpp 24 Aug 2004 15:25:32 -0000 2.11
@@ -151,8 +151,8 @@
OPCODE(o6_invalid),
OPCODE(o6_wordArrayInc),
/* 54 */
- OPCODE(o6_getObjectX),
- OPCODE(o6_getObjectY),
+ OPCODE(o72_objectX),
+ OPCODE(o72_objectY),
OPCODE(o6_byteVarDec),
OPCODE(o6_wordVarDec),
/* 58 */
@@ -396,7 +396,7 @@
int value = pop();
if (num) {
- for (i = 1; i < 128; i++) {
+ for (i = 1; i < num; i++) {
if (args[i] == value) {
push(1);
break;
@@ -407,6 +407,31 @@
}
}
+void ScummEngine_v72he::o72_objectX() {
+ int object = pop();
+ int objnum = getObjectIndex(object);
+
+ if (objnum == -1) {
+ push(0);
+ return;
+ }
+
+ push(_objs[objnum].x_pos);
+}
+
+
+void ScummEngine_v72he::o72_objectY() {
+ int object = pop();
+ int objnum = getObjectIndex(object);
+
+ if (objnum == -1) {
+ push(0);
+ return;
+ }
+
+ push(_objs[objnum].y_pos);
+}
+
void ScummEngine_v72he::o72_startScript() {
int args[16];
int script, flags;
More information about the Scummvm-git-logs
mailing list