Fix some clang warnings
This commit is contained in:
parent
e8bafe7fc5
commit
38495d4449
6 changed files with 8 additions and 10 deletions
|
|
@ -2531,7 +2531,7 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
|
|||
starpostnum = players[player].starpostnum;
|
||||
starposttime = players[player].starposttime;
|
||||
prevcheck = players[player].prevcheck;
|
||||
prevcheck = players[player].nextcheck;
|
||||
nextcheck = players[player].nextcheck;
|
||||
lastsafelap = players[player].lastsafelap;
|
||||
lastsafestarpost = players[player].lastsafestarpost;
|
||||
bigwaypointgap = players[player].bigwaypointgap;
|
||||
|
|
|
|||
|
|
@ -922,7 +922,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
|
|||
|
||||
// Handles key input and string input
|
||||
//
|
||||
static inline boolean HU_keyInChatString(char *s, char ch)
|
||||
/*static inline boolean HU_keyInChatString(char *s, char ch)
|
||||
{
|
||||
size_t l;
|
||||
|
||||
|
|
@ -983,7 +983,7 @@ static inline boolean HU_keyInChatString(char *s, char ch)
|
|||
return false; // did not eat key
|
||||
|
||||
return true; // ate the key
|
||||
}
|
||||
}*/
|
||||
|
||||
//
|
||||
//
|
||||
|
|
|
|||
|
|
@ -7780,7 +7780,7 @@ static boolean P_MobjDeadThink(mobj_t *mobj)
|
|||
{
|
||||
P_SetObjectMomZ(mobj, -2*FRACUNIT/3, true);
|
||||
|
||||
if (mobj->player && (skins[mobj->player->skin].flags && SF_OLDDEATH))
|
||||
if (mobj->player && (skins[mobj->player->skin].flags & SF_OLDDEATH))
|
||||
{
|
||||
mobj->player->drawangle -= ANGLE_22h;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -688,8 +688,7 @@ void R_RenderMaskedSegRange(drawseg_t *drawseg, INT32 x1, INT32 x2)
|
|||
template <typename T>
|
||||
static constexpr T saturating_add(T x, T y) noexcept
|
||||
{
|
||||
INT64 z;
|
||||
z = static_cast<INT64>(x) + static_cast<INT64>(y);
|
||||
INT64 z = static_cast<INT64>(x) + static_cast<INT64>(y);
|
||||
if (z > static_cast<INT64>(std::numeric_limits<T>::max()))
|
||||
{
|
||||
z = static_cast<INT64>(std::numeric_limits<T>::max());
|
||||
|
|
@ -704,8 +703,7 @@ static constexpr T saturating_add(T x, T y) noexcept
|
|||
template <typename T>
|
||||
static constexpr T saturating_mul(T x, T y) noexcept
|
||||
{
|
||||
INT64 z;
|
||||
z = static_cast<INT64>(x) * static_cast<INT64>(y);
|
||||
INT64 z = static_cast<INT64>(x) * static_cast<INT64>(y);
|
||||
if (z > static_cast<INT64>(std::numeric_limits<T>::max()))
|
||||
{
|
||||
z = static_cast<INT64>(std::numeric_limits<T>::max());
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ UINT32 R_GetSkinAvailabilities(void)
|
|||
{
|
||||
if (unlockables[i].type == SECRET_SKIN && unlockables[i].unlocked)
|
||||
{
|
||||
UINT8 s = min(unlockables[i].variable, MAXSKINS);
|
||||
UINT16 s = min(unlockables[i].variable, MAXSKINS);
|
||||
response |= (1 << s);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1571,7 +1571,7 @@ void V_DrawVhsEffect(boolean rewind)
|
|||
fixed_t uby = upbary>>FRACBITS, dby = downbary>>FRACBITS;
|
||||
|
||||
#ifdef HWRENDER
|
||||
if ((rendermode == render_opengl))
|
||||
if (rendermode == render_opengl)
|
||||
{
|
||||
HWR_RenderVhsEffect(uby, dby, updistort, downdistort, barsize);
|
||||
return;
|
||||
|
|
|
|||
Loading…
Reference in a new issue