[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.115,2.116 script_v90he.cpp,2.50,2.51
Travis Howell
kirben at users.sourceforge.net
Tue Sep 21 02:11:14 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4433/scumm
Modified Files:
script_v72he.cpp script_v90he.cpp
Log Message:
HE90+ games use actor layering too, in reverse order.
Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.115
retrieving revision 2.116
diff -u -d -r2.115 -r2.116
--- script_v72he.cpp 21 Sep 2004 01:00:30 -0000 2.115
+++ script_v72he.cpp 21 Sep 2004 09:09:51 -0000 2.116
@@ -601,12 +601,12 @@
if ((_objs[i].obj_nr < 1) || getClass(_objs[i].obj_nr, kObjectClassUntouchable))
continue;
- if (polygonDefined(_objs[i].obj_nr))
+ if (polygonDefined(_objs[i].obj_nr)) {
if (polygonHit(_objs[i].obj_nr, x, y) != 0)
return _objs[i].obj_nr;
-
- //if (VAR(VAR_POLYGONS_ONLY))
- // continue;
+ else if (VAR(VAR_POLYGONS_ONLY))
+ continue;
+ }
b = i;
do {
@@ -908,8 +908,8 @@
debug(1,"o72_actorOps: case 24 (%d)", k);
break;
case 43: // HE 90+
- k = pop();
- debug(1,"o72_actorOps: case 43 (%d)", k);
+ // Uses reverse order of layering, so we adjust
+ a->layer = -pop();
break;
case 64:
_actorClipOverride.bottom = pop();
Index: script_v90he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v90he.cpp,v
retrieving revision 2.50
retrieving revision 2.51
diff -u -d -r2.50 -r2.51
--- script_v90he.cpp 21 Sep 2004 05:59:26 -0000 2.50
+++ script_v90he.cpp 21 Sep 2004 09:09:51 -0000 2.51
@@ -526,7 +526,7 @@
error("o90_unknown1C: unhandled case %d", subOp);
}
- debug(0,"o90_unknown1C stub (%d)", subOp);
+ debug(1,"o90_unknown1C stub (%d)", subOp);
}
void ScummEngine_v90he::o90_unknown25() {
More information about the Scummvm-git-logs
mailing list