thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PARALLACTION: Fixed bug #2969913 - "NIPPON: Katana graphics not shown (regression)"

Browse source
This commit is contained in:
Filippos Karapetis 2011-09-28 14:10:09 +03:00
parent f444a2544d
commit 7aad29572d
1 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/parallaction/parser_ns.cpp
View file

@ -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;