[Scummvm-cvs-logs] scummvm master -> 7aad29572d4b618f6296b3af4102b7c7084c72b5
bluegr
md5 at scummvm.org
Wed Sep 28 13:17:44 CEST 2011
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
7aad29572d PARALLACTION: Fixed bug #2969913 - "NIPPON: Katana graphics not shown (regression)"
Commit: 7aad29572d4b618f6296b3af4102b7c7084c72b5
https://github.com/scummvm/scummvm/commit/7aad29572d4b618f6296b3af4102b7c7084c72b5
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-09-28T04:10:52-07:00
Commit Message:
PARALLACTION: Fixed bug #2969913 - "NIPPON: Katana graphics not shown (regression)"
Changed paths:
engines/parallaction/parser_ns.cpp
diff --git a/engines/parallaction/parser_ns.cpp b/engines/parallaction/parser_ns.cpp
index 100b608..0ee59a0 100644
--- a/engines/parallaction/parser_ns.cpp
+++ b/engines/parallaction/parser_ns.cpp
@@ -1334,6 +1334,21 @@ void LocationParser_ns::parseGetData(ZonePtr z) {
obj->x = z->getX();
obj->y = z->getY();
obj->_prog = _zoneProg;
+
+ // HACK for bug #2969913
+ // The katana object has the same default z index (kGfxObjGetZ or -100)
+ // as the cripta object (the safe).
+ // Game scripts do not set an explicit z for the katana (as it isn't an
+ // animation), but rather rely on the draw order to draw it over the
+ // safe. In this particular case, the safe is added to the scene after
+ // the katana, thus it is drawn over the katana. We explicitly set the
+ // z index of the katana to be higher than the safe, so that the katana
+ // is drawn correctly over it.
+ // This is a regression from the graphics rewrite (commits be2c5d3,
+ // 3c2c16c and 44906f5).
+ if (!scumm_stricmp(obj->getName(), "katana"))
+ obj->z = 0;
+
bool visible = (z->_flags & kFlagsRemove) == 0;
_vm->_gfx->showGfxObj(obj, visible);
data->_gfxobj = obj;
More information about the Scummvm-git-logs
mailing list