From 66cf5dd1d216b71899831fe8cbb676057c5757f7 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Wed, 2 Mar 2011 00:51:07 +0000
Subject: Fixed automap background color, size of plrkilledmsg buffer, a bug
 which caused the scanner to never be depleted from the inventory, and
 emulation of seemingly inconsequential undefined behavior in P_XYMovement via
 use of negative numspechit is currently addressed by changing the branch
 condition to > 0.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2286
---
 src/strife/am_map.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/strife/am_map.c')

diff --git a/src/strife/am_map.c b/src/strife/am_map.c
index 48c6b475..45b46c9b 100644
--- a/src/strife/am_map.c
+++ b/src/strife/am_map.c
@@ -54,12 +54,12 @@
 
 
 // Automap colors
-#define BACKGROUND	0
-#define WALLCOLORS	5           // villsa [STRIFE]
-#define WALLRANGE	16
-#define TSWALLCOLORS	16
-#define FDWALLCOLORS	122         // villsa [STRIFE]
-#define CDWALLCOLORS	116
+#define BACKGROUND      240         // haleyjd [STRIFE]
+#define WALLCOLORS      5           // villsa [STRIFE]
+#define WALLRANGE       16
+#define TSWALLCOLORS    16
+#define FDWALLCOLORS    122         // villsa [STRIFE]
+#define CDWALLCOLORS    116
 #define CTWALLCOLORS    19          // villsa [STRIFE]
 #define SPWALLCOLORS    243         // villsa [STRIFE]
 #define THINGCOLORS     233         // villsa [STRIFE]
@@ -1382,14 +1382,14 @@ void AM_Drawer (void)
 
     // villsa [STRIFE] not used
     /*if(grid)
-	AM_drawGrid(GRIDCOLORS);*/
+        AM_drawGrid(GRIDCOLORS);*/
 
     AM_drawWalls();
     AM_drawPlayers();
 
     // villsa [STRIFE] draw things when map powerup is enabled
     if(cheating == 2 || plr->powers[pw_allmap] > 1)
-	AM_drawThings();
+        AM_drawThings();
 
     // villsa [STRIFE] not used
     //AM_drawCrosshair(XHAIRCOLORS);
-- 
cgit v1.2.3