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

- merged playing_blood and bloodhack variables because they did the same thing.

Browse source 
The only difference was that bloodhack came from NBlood and playing_blood was added for unhandled differences between the backends of EDuke32 and NBlood.
This commit is contained in:
Christoph Oelckers 2019-10-11 00:34:27 +02:00
parent d9d721bff6
commit 14b21bab7a
4 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/blood/src/replace.cpp
View file

@ -99,7 +99,7 @@ void HookReplaceFunctions(void)
loadvoxel_replace = qloadvoxel; loadvoxel_replace = qloadvoxel;
loadboard_replace = qloadboard; loadboard_replace = qloadboard;
saveboard_replace = qsaveboard; saveboard_replace = qsaveboard;
bloodhack = true; playing_blood = true;
} }
END_BLD_NS END_BLD_NS

5
source/build/include/build.h
View file

@ -172,8 +172,8 @@ void yax_updategrays(int32_t posze);
# define YAX_NEXTWALLDEFAULT(Cf) (-1) # define YAX_NEXTWALLDEFAULT(Cf) (-1)
# else # else
// More user tag hijacking: lotag/extra. :/ // More user tag hijacking: lotag/extra. :/
# define YAX_PTRNEXTWALL(Ptr, Wall, Cf) (*(int16_t *)(&Ptr[Wall].lotag + (bloodhack ? 1 : 2)*Cf)) # define YAX_PTRNEXTWALL(Ptr, Wall, Cf) (*(int16_t *)(&Ptr[Wall].lotag + (playing_blood ? 1 : 2)*Cf))
# define YAX_NEXTWALLDEFAULT(Cf) (bloodhack ? 0 : ((Cf)==YAX_CEILING) ? 0 : -1) # define YAX_NEXTWALLDEFAULT(Cf) (playing_blood ? 0 : ((Cf)==YAX_CEILING) ? 0 : -1)
extern int16_t yax_bunchnum[MAXSECTORS][2]; extern int16_t yax_bunchnum[MAXSECTORS][2];
extern int16_t yax_nextwall[MAXWALLS][2]; extern int16_t yax_nextwall[MAXWALLS][2];
# endif # endif
@ -938,7 +938,6 @@ static FORCE_INLINE int32_t videoGetRenderMode(void)
#endif #endif
} }
extern int32_t bloodhack;
enum { enum {
ENGINECOMPATIBILITY_NONE = 0, ENGINECOMPATIBILITY_NONE = 0,
ENGINECOMPATIBILITY_19950829, // Powerslave/Exhumed ENGINECOMPATIBILITY_19950829, // Powerslave/Exhumed

10
source/build/src/engine.cpp
View file

@ -190,8 +190,6 @@ static fix16_t global100horiz; // (-100..300)-scale horiz (the one passed to dr
int32_t(*getpalookup_replace)(int32_t davis, int32_t dashade) = NULL; int32_t(*getpalookup_replace)(int32_t davis, int32_t dashade) = NULL;
int32_t bloodhack = 0;
// adapted from build.c // adapted from build.c
static void getclosestpointonwall_internal(vec2_t const p, int32_t const dawall, vec2_t *const closest) static void getclosestpointonwall_internal(vec2_t const p, int32_t const dawall, vec2_t *const closest)
{ {
@ -755,7 +753,7 @@ void yax_tweakpicnums(int32_t bunchnum, int32_t cf, int32_t restore)
if (editstatus && showinvisibility) if (editstatus && showinvisibility)
SECTORFLD(i,picnum, cf) = MAXTILES-1; SECTORFLD(i,picnum, cf) = MAXTILES-1;
else //if ((dastat&(128+256))==0) else //if ((dastat&(128+256))==0)
SECTORFLD(i,picnum, cf) = bloodhack ? MAXTILES-2 : 13; //FOF; SECTORFLD(i,picnum, cf) = playing_blood ? MAXTILES-2 : 13; //FOF;
} }
else else
{ {
@ -5169,7 +5167,7 @@ static void classicDrawSprite(int32_t snum)
cstat &= ~512; cstat &= ~512;
// Blood's transparency table is inverted // Blood's transparency table is inverted
if (bloodhack) if (playing_blood)
cstat ^= 512; cstat ^= 512;
} }
@ -7021,7 +7019,7 @@ static void dorotatesprite(int32_t sx, int32_t sy, int32_t z, int16_t a, int16_t
dastat &= ~RS_TRANS2; dastat &= ~RS_TRANS2;
// Blood's transparency table is inverted // Blood's transparency table is inverted
if (bloodhack) if (playing_blood)
dastat ^= RS_TRANS2; dastat ^= RS_TRANS2;
} }
} }
@ -7514,7 +7512,7 @@ static void dosetaspect(void)
radarang2[i] = ((qradarang[k]+j)>>6); radarang2[i] = ((qradarang[k]+j)>>6);
} }
if (xdimen != oxdimen && (voxoff[0][0] || bloodhack)) if (xdimen != oxdimen && (voxoff[0][0] || playing_blood))
{ {
distrecip = NULL; distrecip = NULL;
for (i = 0; i < DISTRECIPCACHESIZE; i++) for (i = 0; i < DISTRECIPCACHESIZE; i++)

3
source/build/src/palette.cpp
View file

@ -15,6 +15,7 @@
#include "palette.h" #include "palette.h"
#include "a.h" #include "a.h"
#include "xxhash.h" #include "xxhash.h"
#include "common.h"
#include "../../glbackend/glbackend.h" #include "../../glbackend/glbackend.h"
#include "vfs.h" #include "vfs.h"
@ -387,7 +388,7 @@ void palettePostLoadTables(void)
for (size_t i = 0; i<16; i++) for (size_t i = 0; i<16; i++)
{ {
palette_t *edcol = (palette_t *) &vgapal16[4*i]; palette_t *edcol = (palette_t *) &vgapal16[4*i];
editorcolors[i] = getclosestcol_lim(edcol->b, edcol->g, edcol->r, bloodhack ? 254 : 239); editorcolors[i] = getclosestcol_lim(edcol->b, edcol->g, edcol->r, playing_blood ? 254 : 239);
} }
// Bmemset(PaletteIndexFullbrights, 0, sizeof(PaletteIndexFullbrights)); // Bmemset(PaletteIndexFullbrights, 0, sizeof(PaletteIndexFullbrights));