diff --git a/src/b_bot.c b/src/b_bot.c index 895c8d18d..f67d0db87 100644 --- a/src/b_bot.c +++ b/src/b_bot.c @@ -43,7 +43,7 @@ static inline void B_ResetAI(void) 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; diff --git a/src/hardware/r_opengl/r_opengl.c b/src/hardware/r_opengl/r_opengl.c index 8c0ca7155..c009d3459 100644 --- a/src/hardware/r_opengl/r_opengl.c +++ b/src/hardware/r_opengl/r_opengl.c @@ -417,6 +417,14 @@ static PFNglClientActiveTexture pglClientActiveTexture; #define GL_TEXTURE1 0x84C1 #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) { #ifndef STATIC_OPENGL diff --git a/src/p_enemy.c b/src/p_enemy.c index fa09354d6..738ce46ac 100644 --- a/src/p_enemy.c +++ b/src/p_enemy.c @@ -3342,7 +3342,7 @@ void A_SkullAttack(mobj_t *actor) INT32 i, j; static INT32 k;/* static for (at least) GCC 9.1 weirdness */ boolean allow; - angle_t testang; + angle_t testang = 0; mobjinfo[MT_NULL].spawnstate = S_INVISIBLE; 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 locvar2 = var2; - mobj_t *broked; + mobj_t *broked = NULL; angle_t ang; INT32 i = ((locvar2 & 1) ? 8 : 1); #ifdef HAVE_BLUA diff --git a/src/p_mobj.c b/src/p_mobj.c index 2bd3950a9..4ffaf22c7 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -4652,7 +4652,7 @@ static void P_Boss3Thinker(mobj_t *mobj) { UINT8 i, numtospawn = 24; 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->movefactor = -512*FRACUNIT; diff --git a/src/p_setup.c b/src/p_setup.c index 2216334e7..7f44d11c6 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -3071,7 +3071,7 @@ boolean P_SetupLevel(boolean skipprecip) #endif && !(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) { char *buf = W_CacheLumpName("WATERMAP", PU_STATIC), *b = buf;