summaryrefslogtreecommitdiff
path: root/src/doom/g_game.c
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/doom/g_game.c
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/doom/g_game.c')
-rw-r--r--src/doom/g_game.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/doom/g_game.c b/src/doom/g_game.c
index 4a814871..1c838e92 100644
--- a/src/doom/g_game.c
+++ b/src/doom/g_game.c
@@ -123,7 +123,7 @@ int starttime; // for comparative timing purposes
boolean viewactive;
-boolean deathmatch; // only if started as net death
+int deathmatch; // only if started as net death
boolean netgame; // only true if packets are broadcast
boolean playeringame[MAXPLAYERS];
player_t players[MAXPLAYERS];
@@ -642,8 +642,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)
{