From 2c917ca7e14b323ddc04771a8c7bbce174378caa Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Mon, 7 Dec 2020 17:02:38 +0100 Subject: [PATCH] - fixed cherry picked commit from upstream. --- source/exhumed/src/names.h | 2 ++ source/exhumed/src/view.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/exhumed/src/names.h b/source/exhumed/src/names.h index f1dd2e425..6f0292256 100644 --- a/source/exhumed/src/names.h +++ b/source/exhumed/src/names.h @@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. enum { +kTorch1 = 338, +kTorch2 = 350, kTileRamsesGold = 590, kTileRamsesWorkTile = 591, kTileRamsesNormal = 592, diff --git a/source/exhumed/src/view.cpp b/source/exhumed/src/view.cpp index 80df8f241..82e184d36 100644 --- a/source/exhumed/src/view.cpp +++ b/source/exhumed/src/view.cpp @@ -118,10 +118,10 @@ static void analyzesprites(double const smoothratio) pTSprite->pal = RemapPLU(pTSprite->pal); // PowerSlaveGDX: Torch bouncing fix - if ((pTSprite->picnum == kTile338 || pTSprite->picnum == kTile350) && (pTSprite->cstat & 0x80) == 0) + if ((pTSprite->picnum == kTorch1 || pTSprite->picnum == kTorch2) && (pTSprite->cstat & 0x80) == 0) { pTSprite->cstat |= 0x80; - int nTileY = (tilesiz[pTSprite->picnum].y * pTSprite->yrepeat) * 2; + int nTileY = (tileHeight(pTSprite->picnum) * pTSprite->yrepeat) * 2; pTSprite->z -= nTileY; }