zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SW: Clamp tsprz of blood pool floor decals 

git-svn-id: https://svn.eduke32.com/eduke32@8598 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/names2.h
This commit is contained in:
hendricks266 2020-02-02 06:41:29 +00:00 committed by Christoph Oelckers
parent 364b41bd55
commit 060d19ae35
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/sw/src/draw.cpp
View File

@ -750,8 +750,8 @@ analyzesprites(int viewx, int viewy, int viewz, SWBOOL mirror)
} }
} }
// workaround for mines beneath the floor // workaround for mines and floor decals beneath the floor
if (tsp->picnum == BETTY_R0) if (tsp->picnum == BETTY_R0 || tsp->picnum == FLOORBLOOD1)
{ {
auto sp = (uspriteptr_t)&sprite[SpriteNum]; auto sp = (uspriteptr_t)&sprite[SpriteNum];
int32_t const floorz = getflorzofslope(sp->sectnum, sp->x, sp->y); int32_t const floorz = getflorzofslope(sp->sectnum, sp->x, sp->y);

1
source/sw/src/names2.h
View File

@ -1249,5 +1249,6 @@ enum STAT_ENUMS
#define SCROLL 516 #define SCROLL 516
#define SCROLL_FIRE 524 #define SCROLL_FIRE 524
#define FLOORBLOOD1 389
#endif #endif

1
source/sw/src/weapon.cpp
View File

@ -20840,7 +20840,6 @@ int QueueHole(short ang, short hit_sect, short hit_wall, int hit_x, int hit_y, i
return SpriteNum; return SpriteNum;
} }
#define FLOORBLOOD1 389
#define FLOORBLOOD_RATE 30 #define FLOORBLOOD_RATE 30
ANIMATOR DoFloorBlood; ANIMATOR DoFloorBlood;
STATE s_FloorBlood1[] = STATE s_FloorBlood1[] =