nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

another macro relocation: HI_xxx

Browse Source 
Move HI_DOMESTIC and HI_LORD from monst.c to color.h.
This commit is contained in:
PatR
2023-04-22 16:10:37 -07:00
parent 8a85f1d92c
commit 7105f0a7d9
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/color.h
+5 -1
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 color.h $NHDT-Date: 1596498528 2020/08/03 23:48:48 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.15 $ */ /* NetHack 3.7 color.h $NHDT-Date: 1682205020 2023/04/22 23:10:20 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.18 $ */
/* Copyright (c) Steve Linhart, Eric Raymond, 1989. */ /* Copyright (c) Steve Linhart, Eric Raymond, 1989. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -33,6 +33,10 @@
/* the tty color setup code. (IMHO, it should be removed - dean). */ /* the tty color setup code. (IMHO, it should be removed - dean). */
#define BRIGHT 8 #define BRIGHT 8
/* color aliases used in monsters.h and display.c */
#define HI_DOMESTIC CLR_WHITE /* for player + pets */
#define HI_LORD CLR_MAGENTA /* for high-end monsters */
/* these can be configured */ /* these can be configured */
#define HI_OBJ CLR_MAGENTA #define HI_OBJ CLR_MAGENTA
#define HI_METAL CLR_CYAN #define HI_METAL CLR_CYAN
src/display.c
+1 -3
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 display.c $NHDT-Date: 1672561294 2023/01/01 08:21:34 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.200 $ */ /* NetHack 3.7 display.c $NHDT-Date: 1682205030 2023/04/22 23:10:30 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.215 $ */
/* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */ /* Copyright (c) Dean Luick, with acknowledgements to Kevin Darcy */
/* and Dave Cohrs, 1990. */ /* and Dave Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -2403,7 +2403,6 @@ get_bkglyph_and_framecolor(
#define HAS_ROGUE_IBM_GRAPHICS \ #define HAS_ROGUE_IBM_GRAPHICS \
(gc.currentgraphics == ROGUESET && SYMHANDLING(H_IBM)) (gc.currentgraphics == ROGUESET && SYMHANDLING(H_IBM))
#endif #endif
#define HI_DOMESTIC CLR_WHITE /* monst.c */
/* masks for per-level variances kept in gg.glyphmap_perlevel_flags */ /* masks for per-level variances kept in gg.glyphmap_perlevel_flags */
#define GMAP_SET 0x0001 #define GMAP_SET 0x0001
@@ -3671,7 +3670,6 @@ fn_cmap_to_glyph(int cmap)
#undef Glyphinfo_at #undef Glyphinfo_at
#undef reset_glyph_bbox #undef reset_glyph_bbox
#undef HAS_ROGUE_IBM_GRAPHICS #undef HAS_ROGUE_IBM_GRAPHICS
#undef HI_DOMESTIC
#undef GMAP_SET #undef GMAP_SET
#undef GMAP_ROGUELEVEL #undef GMAP_ROGUELEVEL
src/monst.c
+1 -7
View File
@@ -1,4 +1,4 @@
/* NetHack 3.7 monst.c $NHDT-Date: 1616891049 2021/03/28 00:24:09 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.85 $ */ /* NetHack 3.7 monst.c $NHDT-Date: 1682205027 2023/04/22 23:10:27 $ $NHDT-Branch: NetHack-3.7 $:$NHDT-Revision: 1.97 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2006. */ /*-Copyright (c) Michael Allison, 2006. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -14,8 +14,6 @@
#ifdef TEXTCOLOR #ifdef TEXTCOLOR
#include "color.h" #include "color.h"
#define C(color) color #define C(color) color
#define HI_DOMESTIC CLR_WHITE /* use for player + friendlies */
#define HI_LORD CLR_MAGENTA
#else #else
#define C(color) #define C(color)
#endif #endif
@@ -81,10 +79,6 @@ const struct attack c_sa_no[NATTK] = SEDUCTION_ATTACKS_NO;
end of the source code seen by the compiler */ end of the source code seen by the compiler */
#undef C #undef C
#define C(c) (0x1f & (c)) /* global.h */ #define C(c) (0x1f & (c)) /* global.h */
#ifdef TEXTCOLOR
#undef HI_DOMESTIC
#undef HI_LORD
#endif
#undef NO_ATTK #undef NO_ATTK
#undef MON #undef MON
#undef MON3 #undef MON3