stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-30 13:10:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixup compiling errors

Browse source
This commit is contained in:
Alam Ed Arias 2019-12-02 12:12:26 -05:00
parent ae2594e5ce
commit b5738620c1
5 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/b_bot.c
View file

@ -43,7 +43,7 @@ static inline void B_ResetAI(void)
thinkfly = false; thinkfly = false;
} }
static inline void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd) static void B_BuildTailsTiccmd(mobj_t *sonic, mobj_t *tails, ticcmd_t *cmd)
{ {
boolean forward=false, backward=false, left=false, right=false, jump=false, spin=false; boolean forward=false, backward=false, left=false, right=false, jump=false, spin=false;

8
src/hardware/r_opengl/r_opengl.c
View file

@ -417,6 +417,14 @@ static PFNglClientActiveTexture pglClientActiveTexture;
#define GL_TEXTURE1 0x84C1 #define GL_TEXTURE1 0x84C1
#endif #endif
/* 1.5 Parms */
#ifndef GL_ARRAY_BUFFER
#define GL_ARRAY_BUFFER 0x8892
#endif
#ifndef GL_STATIC_DRAW
#define GL_STATIC_DRAW 0x88E4
#endif
boolean SetupGLfunc(void) boolean SetupGLfunc(void)
{ {
#ifndef STATIC_OPENGL #ifndef STATIC_OPENGL

4
src/p_enemy.c
View file

@ -3342,7 +3342,7 @@ void A_SkullAttack(mobj_t *actor)
INT32 i, j; INT32 i, j;
static INT32 k;/* static for (at least) GCC 9.1 weirdness */ static INT32 k;/* static for (at least) GCC 9.1 weirdness */
boolean allow; boolean allow;
angle_t testang; angle_t testang = 0;
mobjinfo[MT_NULL].spawnstate = S_INVISIBLE; mobjinfo[MT_NULL].spawnstate = S_INVISIBLE;
mobjinfo[MT_NULL].flags = MF_NOGRAVITY|MF_NOTHINK|MF_NOCLIPTHING|MF_NOBLOCKMAP; mobjinfo[MT_NULL].flags = MF_NOGRAVITY|MF_NOTHINK|MF_NOCLIPTHING|MF_NOBLOCKMAP;
@ -13379,7 +13379,7 @@ void A_Boss5MakeJunk(mobj_t *actor)
{ {
INT32 locvar1 = var1; INT32 locvar1 = var1;
INT32 locvar2 = var2; INT32 locvar2 = var2;
mobj_t *broked; mobj_t *broked = NULL;
angle_t ang; angle_t ang;
INT32 i = ((locvar2 & 1) ? 8 : 1); INT32 i = ((locvar2 & 1) ? 8 : 1);
#ifdef HAVE_BLUA #ifdef HAVE_BLUA

2
src/p_mobj.c
View file

@ -4652,7 +4652,7 @@ static void P_Boss3Thinker(mobj_t *mobj)
{ {
UINT8 i, numtospawn = 24; UINT8 i, numtospawn = 24;
angle_t ang = 0, interval = FixedAngle((360 << FRACBITS) / numtospawn); angle_t ang = 0, interval = FixedAngle((360 << FRACBITS) / numtospawn);
mobj_t *shock, *sfirst, *sprev = NULL; mobj_t *shock, *sfirst = NULL, *sprev = NULL;
mobj->movecount = mobj->health+1; mobj->movecount = mobj->health+1;
mobj->movefactor = -512*FRACUNIT; mobj->movefactor = -512*FRACUNIT;

2
src/p_setup.c
View file

@ -3071,7 +3071,7 @@ boolean P_SetupLevel(boolean skipprecip)
#endif #endif
&& !(netgame || multiplayer) && gamemap == 0x1d35-016464) && !(netgame || multiplayer) && gamemap == 0x1d35-016464)
{ {
P_SpawnMobj(0640370000, 0x11000000, 0b11000110000000000000000000, MT_LETTER)->angle = ANGLE_90; P_SpawnMobj(0640370000, 0x11000000, 0x3180000, MT_LETTER)->angle = ANGLE_90;
if (textprompts[199]->page[1].backcolor != 259) if (textprompts[199]->page[1].backcolor != 259)
{ {
char *buf = W_CacheLumpName("WATERMAP", PU_STATIC), *b = buf; char *buf = W_CacheLumpName("WATERMAP", PU_STATIC), *b = buf;