From f4886657c1e4cbbe29b472c4a088ec71e3ade6d7 Mon Sep 17 00:00:00 2001
From: Alam Ed Arias <alam@srb2.org>
Date: Fri, 5 Feb 2016 22:12:12 -0500
Subject: [PATCH] clang: fixup a few clang warnings
---
src/info.c | 2 +-
src/m_menu.c | 2 +-
src/p_enemy.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/info.c b/src/info.c
index fb30258c31..17384086ad 100644
--- a/src/info.c
+++ b/src/info.c
@@ -4225,7 +4225,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
MT_GOOP, // painchance
sfx_dmpain, // painsound
S_EGGMOBILE2_PAIN2, // meleestate
- MT_EGGMOBILE2_POGO, // missilestate
+ (mobjtype_t)MT_EGGMOBILE2_POGO, // missilestate
S_EGGMOBILE2_DIE1, // deathstate
S_EGGMOBILE2_FLEE1,// xdeathstate
sfx_cybdth, // deathsound
diff --git a/src/m_menu.c b/src/m_menu.c
index c7a9fcc162..1e7745535d 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -6071,7 +6071,7 @@ static void M_RoomMenu(INT32 choice)
for (i = 0; room_list[i].header.buffer[0]; i++)
{
- if(room_list[i].name != '\0')
+ if(*room_list[i].name != '\0')
{
MP_RoomMenu[i+1].text = room_list[i].name;
roomIds[i] = room_list[i].id;
diff --git a/src/p_enemy.c b/src/p_enemy.c
index 18a4ec5ff4..6ac4e89689 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -6352,7 +6352,7 @@ void A_Boss2PogoTarget(mobj_t *actor)
if (actor->info->missilestate) // spawn the pogo stick collision box
{
- mobj_t *pogo = P_SpawnMobj(actor->x, actor->y, actor->z - mobjinfo[actor->info->missilestate].height, actor->info->missilestate);
+ mobj_t *pogo = P_SpawnMobj(actor->x, actor->y, actor->z - mobjinfo[actor->info->missilestate].height, (mobjtype_t)actor->info->missilestate);
pogo->target = actor;
}
--
GitLab