Merge branch 'fixme' into 'master'
Build fixes See merge request STJr/SRB2Internal!287
This commit is contained in:
commit
3196fd225d
|
@ -1198,7 +1198,7 @@ static UINT8 P_GetModelSprite2(md2_t *md2, skin_t *skin, UINT8 spr2, player_t *p
|
||||||
if (!md2 || !skin)
|
if (!md2 || !skin)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if ((spr2 & ~FF_SPR2SUPER) >= free_spr2)
|
if ((unsigned)(spr2 & ~FF_SPR2SUPER) >= free_spr2)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
while (!(md2->model->spr2frames[spr2*2 + 1])
|
while (!(md2->model->spr2frames[spr2*2 + 1])
|
||||||
|
|
|
@ -1309,12 +1309,12 @@ static menuitem_t OP_SoundOptionsMenu[] =
|
||||||
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 115}, // 56
|
{IT_STRING | IT_CVAR, NULL, "Closed Captioning", &cv_closedcaptioning, 115}, // 56
|
||||||
{IT_STRING | IT_CVAR, NULL, "Reset Music Upon Dying", &cv_resetmusic, 125}, // 62
|
{IT_STRING | IT_CVAR, NULL, "Reset Music Upon Dying", &cv_resetmusic, 125}, // 62
|
||||||
|
|
||||||
#if defined(HAVE_OPENMPT) || defined(HAVE_MIXERX)
|
#ifdef HAVE_MIXERX
|
||||||
{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 143},
|
{IT_STRING | IT_SUBMENU, NULL, "Advanced Settings...", &OP_SoundAdvancedDef, 143},
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(HAVE_OPENMPT) || defined(HAVE_MIXERX)
|
#ifdef HAVE_MIXERX
|
||||||
|
|
||||||
#ifdef HAVE_OPENMPT
|
#ifdef HAVE_OPENMPT
|
||||||
#define OPENMPT_MENUOFFSET 32
|
#define OPENMPT_MENUOFFSET 32
|
||||||
|
|
|
@ -13715,4 +13715,4 @@ void A_ModuloToState(mobj_t *actor)
|
||||||
if ((modulothing % locvar1 == 0))
|
if ((modulothing % locvar1 == 0))
|
||||||
P_SetMobjState(actor, (locvar2));
|
P_SetMobjState(actor, (locvar2));
|
||||||
modulothing++;
|
modulothing++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2404,7 +2404,7 @@ static void P_NetArchiveThinkers(void)
|
||||||
}
|
}
|
||||||
#endif // ESLOPE
|
#endif // ESLOPE
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
else if (th->function.acp1 != P_RemoveThinkerDelayed) // wait garbage collection
|
else if (th->function.acp1 != (actionf_p1)P_RemoveThinkerDelayed) // wait garbage collection
|
||||||
I_Error("unknown thinker type %p", th->function.acp1);
|
I_Error("unknown thinker type %p", th->function.acp1);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
|
@ -9265,4 +9265,4 @@ static void P_SpawnPushers(void)
|
||||||
Add_Pusher(p_downwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
Add_Pusher(p_downwind, l->dx, l->dy, NULL, s, -1, l->flags & ML_NOCLIMB, l->flags & ML_EFFECT4);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -197,7 +197,7 @@ void P_InitThinkers(void)
|
||||||
void P_AddThinker(const thinklistnum_t n, thinker_t *thinker)
|
void P_AddThinker(const thinklistnum_t n, thinker_t *thinker)
|
||||||
{
|
{
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
I_Assert(n >= 0 && n < NUM_THINKERLISTS);
|
I_Assert(n < NUM_THINKERLISTS);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
thlist[n].prev->next = thinker;
|
thlist[n].prev->next = thinker;
|
||||||
|
@ -326,7 +326,7 @@ static inline void P_RunThinkers(void)
|
||||||
for (currentthinker = thlist[i].next; currentthinker != &thlist[i]; currentthinker = currentthinker->next)
|
for (currentthinker = thlist[i].next; currentthinker != &thlist[i]; currentthinker = currentthinker->next)
|
||||||
{
|
{
|
||||||
#ifdef PARANOIA
|
#ifdef PARANOIA
|
||||||
I_Assert(currentthinker->function.acp1 != NULL)
|
I_Assert(currentthinker->function.acp1 != NULL);
|
||||||
#endif
|
#endif
|
||||||
currentthinker->function.acp1(currentthinker);
|
currentthinker->function.acp1(currentthinker);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2511,7 +2511,7 @@ UINT8 P_GetSkinSprite2(skin_t *skin, UINT8 spr2, player_t *player)
|
||||||
if (!skin)
|
if (!skin)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if ((spr2 & ~FF_SPR2SUPER) >= free_spr2)
|
if ((unsigned)(spr2 & ~FF_SPR2SUPER) >= free_spr2)
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
while (!(skin->sprites[spr2].numframes)
|
while (!(skin->sprites[spr2].numframes)
|
||||||
|
|
|
@ -2304,4 +2304,4 @@ void ModFilter_OnChange(void)
|
||||||
if (openmpt_mhandle)
|
if (openmpt_mhandle)
|
||||||
openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH, cv_modfilter.value);
|
openmpt_module_set_render_param(openmpt_mhandle, OPENMPT_MODULE_RENDER_INTERPOLATIONFILTER_LENGTH, cv_modfilter.value);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue