From d62674c18436eefbb21b3c5de33bd7aaebf651eb Mon Sep 17 00:00:00 2001
From: James R <justsomejames2@gmail.com>
Date: Tue, 22 Oct 2019 19:18:56 -0700
Subject: [PATCH] Clang warnings
---
src/info.c | 8 ++++----
src/p_enemy.c | 2 +-
src/p_user.c | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/info.c b/src/info.c
index 33340876e9..23ba67f37b 100644
--- a/src/info.c
+++ b/src/info.c
@@ -4059,7 +4059,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MT_THOK, // damage
sfx_None, // activesound
MF_SOLID|MF_SHOOTABLE, // flags
- MT_NULL // raisestate
+ (statenum_t)MT_NULL// raisestate
},
{ // MT_TAILSOVERLAY
@@ -4491,7 +4491,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // damage
sfx_s3kd2l, // activesound
MF_PAIN|MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
- MT_CRUSHCHAIN // raisestate
+ (statenum_t)MT_CRUSHCHAIN// raisestate
},
{ // MT_CRUSHCHAIN
@@ -11829,7 +11829,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // damage
sfx_None, // activesound
MF_SLIDEME|MF_SOLID|MF_PUSHABLE, // flags
- MT_ROCKCRUMBLE3 // raisestate
+ (statenum_t)MT_ROCKCRUMBLE3// raisestate
},
{ // MT_BRAMBLES
@@ -12531,7 +12531,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
0, // damage
sfx_s3k76, // activesound
MF_PUSHABLE, // flags
- MT_MINECARTSIDEMARK // raisestate
+ (statenum_t)MT_MINECARTSIDEMARK// raisestate
},
{ // MT_MINECARTSEG
diff --git a/src/p_enemy.c b/src/p_enemy.c
index f67d7d194a..06544392d5 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -2170,7 +2170,7 @@ void A_CrushclawLaunch(mobj_t *actor)
UINT8 i = 0;
for (i = 0; (i < CSEGS); i++)
{
- mobj_t *newchain = P_SpawnMobjFromMobj(actor, 0, 0, 0, actor->info->raisestate);
+ mobj_t *newchain = P_SpawnMobjFromMobj(actor, 0, 0, 0, (mobjtype_t)actor->info->raisestate);
P_SetTarget(&prevchain->target, newchain);
prevchain = newchain;
}
diff --git a/src/p_user.c b/src/p_user.c
index a67274d796..3f4d082228 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -10456,7 +10456,7 @@ static mobj_t *P_LookForRails(mobj_t* mobj, fixed_t c, fixed_t s, angle_t target
//Axes must be directly parallel or antiparallel, give or take 5 degrees.
if (angdiff < ANG10)
{
- mark = P_SpawnMobj(nx, ny, nz, mobj->info->raisestate);
+ mark = P_SpawnMobj(nx, ny, nz, (mobjtype_t)mobj->info->raisestate);
return mark;
}
}
--
GitLab