From 1ec21c92ed4c3f792e642524c5cd5bc30b6d7457 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sun, 23 Oct 2011 13:29:09 +0000
Subject: Fix compiler warnings (thanks Edward-San).

Subversion-branch: /branches/v2-branch
Subversion-revision: 2459
---
 src/hexen/sb_bar.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'src/hexen/sb_bar.c')

diff --git a/src/hexen/sb_bar.c b/src/hexen/sb_bar.c
index 13b41ae3..01a2ef0c 100644
--- a/src/hexen/sb_bar.c
+++ b/src/hexen/sb_bar.c
@@ -1798,10 +1798,20 @@ static void CheatIDKFAFunc(player_t * player, Cheat_t * cheat)
     {
         return;
     }
-    for (i = 1; i < 8; i++)
+    for (i = 1; i < NUMWEAPONS; i++)
     {
         player->weaponowned[i] = false;
     }
+
+    // In the original code, NUMWEAPONS was 8. So the writes to weaponowned
+    // overflowed the array. We must set the following fields to zero as
+    // well:
+
+    player->mana[0] = 0;
+    player->mana[1] = 0;
+    player->attackdown = 0;
+    player->usedown = 0;
+
     player->pendingweapon = WP_FIRST;
     P_SetMessage(player, TXT_CHEATIDKFA, true);
 }
-- 
cgit v1.2.3