diff options
author | James Haley | 2011-03-02 00:51:07 +0000 |
---|---|---|
committer | James Haley | 2011-03-02 00:51:07 +0000 |
commit | 66cf5dd1d216b71899831fe8cbb676057c5757f7 (patch) | |
tree | dfa278067cae6484f335a53adb99d4b9122583ed /src/strife/am_map.c | |
parent | af19c6755955d7d397454cd2fd988270ee2f0561 (diff) | |
download | chocolate-doom-66cf5dd1d216b71899831fe8cbb676057c5757f7.tar.gz chocolate-doom-66cf5dd1d216b71899831fe8cbb676057c5757f7.tar.bz2 chocolate-doom-66cf5dd1d216b71899831fe8cbb676057c5757f7.zip |
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
Diffstat (limited to 'src/strife/am_map.c')
-rw-r--r-- | src/strife/am_map.c | 16 |
1 files changed, 8 insertions, 8 deletions
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); |