From dbc149f85a340d9eeff6ce9550505779a008f360 Mon Sep 17 00:00:00 2001 From: Jaime Passos Date: Mon, 19 Oct 2020 17:33:16 -0300 Subject: [PATCH] Remove FLOORSPLATS define --- src/doomdef.h | 3 --- src/r_splats.c | 3 --- src/r_splats.h | 2 -- src/r_things.c | 4 ---- 4 files changed, 12 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index 98a22e5ab..d0b7ea0c2 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -641,9 +641,6 @@ extern const char *compdate, *comptime, *comprevision, *compbranch; /// Render flats on walls #define WALLFLATS -/// Floor splats -#define FLOORSPLATS - /// Maintain compatibility with older 2.2 demos #define OLD22DEMOCOMPAT diff --git a/src/r_splats.c b/src/r_splats.c index 10cf1127c..c4074f3d1 100644 --- a/src/r_splats.c +++ b/src/r_splats.c @@ -20,7 +20,6 @@ struct rastery_s *prastertab; // for ASM code -#ifdef FLOORSPLATS static struct rastery_s rastertab[MAXVIDHEIGHT]; static void prepare_rastertab(void); @@ -412,5 +411,3 @@ static void prepare_rastertab(void) rastertab[i].maxx = INT32_MIN; } } - -#endif // FLOORSPLATS diff --git a/src/r_splats.h b/src/r_splats.h index ba5052fc9..6ee8d5c6f 100644 --- a/src/r_splats.h +++ b/src/r_splats.h @@ -28,7 +28,6 @@ struct rastery_s }; extern struct rastery_s *prastertab; // for ASM code -#ifdef FLOORSPLATS typedef struct floorsplat_s { UINT16 *pic; @@ -44,6 +43,5 @@ typedef struct floorsplat_s } floorsplat_t; void R_RenderFloorSplat(floorsplat_t *pSplat, vector2_t *verts, vissprite_t *vis); -#endif #endif /*__R_SPLATS_H__*/ diff --git a/src/r_things.c b/src/r_things.c index 444b671d2..1a2061cec 100644 --- a/src/r_things.c +++ b/src/r_things.c @@ -2769,7 +2769,6 @@ void R_InitDrawNodes(void) static void R_DrawVisSplat(vissprite_t *spr) { -#ifdef FLOORSPLATS floorsplat_t splat; fixed_t tr_x, tr_y, rot_x, rot_y, rot_z; @@ -2958,9 +2957,6 @@ static void R_DrawVisSplat(vissprite_t *spr) } R_RenderFloorSplat(&splat, v2d, spr); -#else - (void)spr; -#endif } //