summaryrefslogtreecommitdiff
path: root/src/hexen
diff options
context:
space:
mode:
authorSimon Howard2014-03-24 00:18:33 -0400
committerSimon Howard2014-03-24 00:18:33 -0400
commit19466db77813385693cf78b8bc7d97b58dd2b14c (patch)
tree47a31cfb8ac8ae0dadacdfa6906a0abb4f4d5c91 /src/hexen
parent42faefce1fd03f5d613bf709d3c14925ee560064 (diff)
downloadchocolate-doom-19466db77813385693cf78b8bc7d97b58dd2b14c.tar.gz
chocolate-doom-19466db77813385693cf78b8bc7d97b58dd2b14c.tar.bz2
chocolate-doom-19466db77813385693cf78b8bc7d97b58dd2b14c.zip
Fix various Clang compiler warnings.
Diffstat (limited to 'src/hexen')
-rw-r--r--src/hexen/a_action.c2
-rw-r--r--src/hexen/g_game.c4
-rw-r--r--src/hexen/p_enemy.c11
-rw-r--r--src/hexen/p_inter.c2
-rw-r--r--src/hexen/p_spec.c3
5 files changed, 15 insertions, 7 deletions
diff --git a/src/hexen/a_action.c b/src/hexen/a_action.c
index af727480..19b1543b 100644
--- a/src/hexen/a_action.c
+++ b/src/hexen/a_action.c
@@ -860,8 +860,6 @@ boolean A_LocalQuake(byte * args, mobj_t * actor)
int lastfound = 0;
int success = false;
- actor = actor; // suppress warning
-
// Find all quake foci
do
{
diff --git a/src/hexen/g_game.c b/src/hexen/g_game.c
index bc58b128..17ec04b9 100644
--- a/src/hexen/g_game.c
+++ b/src/hexen/g_game.c
@@ -662,8 +662,8 @@ void G_DoLoadLevel(void)
joyxmove = joyymove = 0;
mousex = mousey = 0;
sendpause = sendsave = paused = false;
- memset(mousebuttons, 0, sizeof(mousebuttons));
- memset(joybuttons, 0, sizeof(joybuttons));
+ memset(mousearray, 0, sizeof(mousearray));
+ memset(joyarray, 0, sizeof(joyarray));
if (testcontrols)
{
diff --git a/src/hexen/p_enemy.c b/src/hexen/p_enemy.c
index da987f16..6c9ca194 100644
--- a/src/hexen/p_enemy.c
+++ b/src/hexen/p_enemy.c
@@ -430,7 +430,9 @@ void P_NewChaseDir(mobj_t * actor)
}
else
{
- for (tdir = DI_SOUTHEAST; tdir != DI_EAST-1; tdir--)
+ tdir = DI_SOUTHEAST;
+
+ for (;;)
{
if (tdir != turnaround)
{
@@ -438,6 +440,13 @@ void P_NewChaseDir(mobj_t * actor)
if (P_TryWalk(actor))
return;
}
+
+ if (tdir == DI_EAST)
+ {
+ break;
+ }
+
+ --tdir;
}
}
diff --git a/src/hexen/p_inter.c b/src/hexen/p_inter.c
index 9e196c79..063e3c64 100644
--- a/src/hexen/p_inter.c
+++ b/src/hexen/p_inter.c
@@ -177,7 +177,7 @@ boolean P_GiveMana(player_t * player, manatype_t mana, int count)
{
return (false);
}
- if (mana < 0 || mana > NUMMANA)
+ if ((unsigned int) mana > NUMMANA)
{
I_Error("P_GiveMana: bad type %i", mana);
}
diff --git a/src/hexen/p_spec.c b/src/hexen/p_spec.c
index 03c98cbc..99ae73ae 100644
--- a/src/hexen/p_spec.c
+++ b/src/hexen/p_spec.c
@@ -447,7 +447,8 @@ boolean EV_LineSearchForPuzzleItem(line_t * line, byte * args, mobj_t * mo)
{
player_t *player;
int i;
- artitype_t type, arti;
+ int type;
+ artitype_t arti;
if (!mo)
return false;