diff options
| author | Travis Howell | 2004-09-21 09:09:51 +0000 |
|---|---|---|
| committer | Travis Howell | 2004-09-21 09:09:51 +0000 |
| commit | b359c9281fe66f6488aad3f15b5c468a64343bae (patch) | |
| tree | 0b084e5f79d90da2576778ed891878c27bc1e71e | |
| parent | d49f0b90a0bb870f192689100bbe7a34a96e6fc3 (diff) | |
| download | scummvm-rg350-b359c9281fe66f6488aad3f15b5c468a64343bae.tar.gz scummvm-rg350-b359c9281fe66f6488aad3f15b5c468a64343bae.tar.bz2 scummvm-rg350-b359c9281fe66f6488aad3f15b5c468a64343bae.zip | |
HE90+ games use actor layering too, in reverse order.
svn-id: r15216
| -rw-r--r-- | scumm/script_v72he.cpp | 12 | ||||
| -rw-r--r-- | scumm/script_v90he.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp index a794b49927..9875ad717f 100644 --- a/scumm/script_v72he.cpp +++ b/scumm/script_v72he.cpp @@ -601,12 +601,12 @@ int ScummEngine_v72he::findObject(int x, int y, int *args) { 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 @@ void ScummEngine_v72he::o72_actorOps() { 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(); diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp index 88664750bc..487bb8d4c6 100644 --- a/scumm/script_v90he.cpp +++ b/scumm/script_v90he.cpp @@ -526,7 +526,7 @@ void ScummEngine_v90he::o90_unknown1C() { 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() { |