- removed wallext because its only member 'blend' is not used by anything.

This is a feature not worth preserving, render style + alpha should be done directly, not via indirect lookup tables.
This commit is contained in:
Christoph Oelckers 2020-10-11 18:44:16 +02:00
parent e6bd5989c2
commit f12c6b0319
4 changed files with 1 additions and 18 deletions

View file

@ -216,12 +216,6 @@ typedef struct {
uint8_t filler[2];
} spritesmooth_t;
#ifndef NEW_MAP_FORMAT
typedef struct {
uint8_t blend;
} wallext_t;
#endif
#define SPREXT_NOTMD 1
#define SPREXT_NOMDANIM 2
#define SPREXT_AWAY1 4
@ -257,9 +251,6 @@ extern usermaphack_t g_loadedMapHack;
#if !defined DEBUG_MAIN_ARRAYS
EXTERN spriteext_t *spriteext;
EXTERN spritesmooth_t *spritesmooth;
# ifndef NEW_MAP_FORMAT
EXTERN wallext_t *wallext;
# endif
EXTERN sectortype *sector;
EXTERN walltype *wall;

View file

@ -903,7 +903,6 @@ static spriteext_t spriteext_s[MAXSPRITES+MAXUNIQHUDID];
static spritesmooth_t spritesmooth_s[MAXSPRITES+MAXUNIQHUDID];
static sectortype sector_s[MAXSECTORS];
static walltype wall_s[MAXWALLS];
static wallext_t wallext_s[MAXWALLS];
static spritetype sprite_s[MAXSPRITES];
static tspritetype tsprite_s[MAXSPRITESONSCREEN];
@ -913,7 +912,6 @@ int32_t enginePreInit(void)
sector = sector_s;
wall = wall_s;
wallext = wallext_s;
sprite = sprite_s;
tsprite = tsprite_s;
spriteext = spriteext_s;

View file

@ -2751,11 +2751,7 @@ static void polymost_drawmaskwallinternal(int32_t wallIndex)
if (wal->cstat & 128)
method = DAMETH_WALL | (((wal->cstat & 512)) ? DAMETH_TRANS2 : DAMETH_TRANS1);
#ifdef NEW_MAP_FORMAT
uint8_t const blend = wal->blend;
#else
uint8_t const blend = wallext[wallIndex].blend;
#endif
uint8_t const blend = 0;// wal->blend; nothing sets this and this feature is not worth reimplementing (render style needs to be done less hacky.)
SetRenderStyleFromBlend(!!(wal->cstat & 128), blend, !!(wal->cstat & 512));
drawpoly_alpha = 0.f;

View file

@ -579,7 +579,6 @@ void SaveEngineState()
fw->Write(&Numsprites, sizeof(Numsprites));
sv_prespriteextsave();
fw->Write(spriteext, sizeof(spriteext_t) * MAXSPRITES);
fw->Write(wallext, sizeof(wallext_t) * MAXWALLS);
fw->Write(&randomseed, sizeof(randomseed));
sv_postspriteext();
WriteMagic(fw);
@ -627,7 +626,6 @@ void LoadEngineState()
fr.Read(&Numsprites, sizeof(Numsprites));
fr.Read(spriteext, sizeof(spriteext_t) * MAXSPRITES);
fr.Read(wallext, sizeof(wallext_t) * MAXWALLS);
fr.Read(&randomseed, sizeof(randomseed));
sv_postspriteext();
CheckMagic(fr);