From 060d19ae35d7be315757b84d9a8e1a92fd536eba Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Sun, 2 Feb 2020 06:41:29 +0000 Subject: [PATCH] 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 --- source/sw/src/draw.cpp | 4 ++-- source/sw/src/names2.h | 1 + source/sw/src/weapon.cpp | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/sw/src/draw.cpp b/source/sw/src/draw.cpp index 52fbb4d86..9e2db2810 100644 --- a/source/sw/src/draw.cpp +++ b/source/sw/src/draw.cpp @@ -750,8 +750,8 @@ analyzesprites(int viewx, int viewy, int viewz, SWBOOL mirror) } } - // workaround for mines beneath the floor - if (tsp->picnum == BETTY_R0) + // workaround for mines and floor decals beneath the floor + if (tsp->picnum == BETTY_R0 || tsp->picnum == FLOORBLOOD1) { auto sp = (uspriteptr_t)&sprite[SpriteNum]; int32_t const floorz = getflorzofslope(sp->sectnum, sp->x, sp->y); diff --git a/source/sw/src/names2.h b/source/sw/src/names2.h index 2c435e586..bb53340d8 100644 --- a/source/sw/src/names2.h +++ b/source/sw/src/names2.h @@ -1249,5 +1249,6 @@ enum STAT_ENUMS #define SCROLL 516 #define SCROLL_FIRE 524 +#define FLOORBLOOD1 389 #endif diff --git a/source/sw/src/weapon.cpp b/source/sw/src/weapon.cpp index ee8526349..dd5da7411 100644 --- a/source/sw/src/weapon.cpp +++ b/source/sw/src/weapon.cpp @@ -20840,7 +20840,6 @@ int QueueHole(short ang, short hit_sect, short hit_wall, int hit_x, int hit_y, i return SpriteNum; } -#define FLOORBLOOD1 389 #define FLOORBLOOD_RATE 30 ANIMATOR DoFloorBlood; STATE s_FloorBlood1[] =