zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-02-04 21:00:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed cherry picked commit from upstream.

Browse source
This commit is contained in:
Christoph Oelckers 2020-12-07 17:02:38 +01:00
parent b3988165e2
commit 2c917ca7e1
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/exhumed/src/names.h
View file

@ -20,6 +20,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
enum enum
{ {
kTorch1 = 338,
kTorch2 = 350,
kTileRamsesGold = 590, kTileRamsesGold = 590,
kTileRamsesWorkTile = 591, kTileRamsesWorkTile = 591,
kTileRamsesNormal = 592, kTileRamsesNormal = 592,

4
source/exhumed/src/view.cpp
View file

@ -118,10 +118,10 @@ static void analyzesprites(double const smoothratio)
pTSprite->pal = RemapPLU(pTSprite->pal); pTSprite->pal = RemapPLU(pTSprite->pal);
// PowerSlaveGDX: Torch bouncing fix // 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; pTSprite->cstat |= 0x80;
int nTileY = (tilesiz[pTSprite->picnum].y * pTSprite->yrepeat) * 2; int nTileY = (tileHeight(pTSprite->picnum) * pTSprite->yrepeat) * 2;
pTSprite->z -= nTileY; pTSprite->z -= nTileY;
} }