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

Merge branch 'NetHack-3.6'

Browse Source
This commit is contained in:
nhmall
2019-10-17 20:52:10 -04:00
parent 72fcfadf23 389c496055
commit 3ccc6e5308
19 changed files with 742 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/decl.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 decl.c $NHDT-Date: 1547025164 2019/01/09 09:12:44 $ $NHDT-Branch: NetHack-3.6.2-beta01 $:$NHDT-Revision: 1.141 $ */
/* NetHack 3.6 decl.c $NHDT-Date: 1571352532 2019/10/17 22:48:52 $ $NHDT-Branch: NetHack-3.6 $:$NHDT-Revision: 1.146 $ */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/*-Copyright (c) Michael Allison, 2009. */
/* NetHack may be freely redistributed. See license for details. */
@@ -40,6 +40,7 @@ NEARDATA struct obj *uwep, *uarm, *uswapwep,
#ifdef TEXTCOLOR
/*
* This must be the same order as used for buzz() in zap.c.
* (They're only used in mapglyph.c so probably shouldn't be here.)
*/
const int zapcolors[NUM_ZAP] = {
HI_ZAP, /* 0 - missile */
@@ -48,8 +49,10 @@ const int zapcolors[NUM_ZAP] = {
HI_ZAP, /* 3 - sleep */
CLR_BLACK, /* 4 - death */
CLR_WHITE, /* 5 - lightning */
CLR_YELLOW, /* 6 - poison gas */
CLR_GREEN, /* 7 - acid */
/* 3.6.3: poison gas zap used to be yellow and acid zap was green,
which conflicted with the corresponding dragon colors */
CLR_GREEN, /* 6 - poison gas */
CLR_YELLOW, /* 7 - acid */
};
#endif /* text color */