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

minions/Angels (trunk only)

Browse Source 
Angels used the epri extension even though they're never priests,
presumeably because they're sometimes flagged as "renegade".  Since the
only priests ever flagged as renegade are roaming minions rather than
temple priests, move the renegade flag to the emin extension and switch
Angels over to that.  Summoned Angels will now always have the isminion
flag set.

     Makefiles need updating:  monst.{c,o} now depends upon emin.h.
This commit is contained in:
nethack.rankin
2005-11-03 04:54:55 +00:00
parent 940a70d6ae
commit 7921c6ea3e
7 changed files with 108 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/emin.h
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)emin.h 3.5 1997/05/01 */
/* SCCS Id: @(#)emin.h 3.5 2005/11/02 */
/* Copyright (c) David Cohrs, 1990. */
/* NetHack may be freely redistributed. See license for details. */
@@ -7,6 +7,7 @@
struct emin {
aligntyp min_align; /* alignment of minion */
boolean renegade; /* hostile co-aligned priest or Angel */
};
#define EMIN(mon) ((struct emin *)&(mon)->mextra[0])

9
include/epri.h
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)epri.h 3.5 1997/05/01 */
/* SCCS Id: @(#)epri.h 3.5 2005/11/02 */
/* Copyright (c) Izchak Miller, 1989. */
/* NetHack may be freely redistributed. See license for details. */
@@ -15,10 +15,7 @@ struct epri {
#define EPRI(mon) ((struct epri *)&(mon)->mextra[0])
/* A priest without ispriest is a roaming priest without a shrine, so
* the fields (except shralign, which becomes only the priest alignment)
* are available for reuse.
*/
#define renegade shroom
/* note: roaming priests (no shrine) switch from ispriest to isminion
(and emin extension) */
#endif /* EPRI_H */

4
include/patchlevel.h
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)patchlevel.h 3.5 2005/09/12 */
/* SCCS Id: @(#)patchlevel.h 3.5 2005/11/02 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -13,7 +13,7 @@
* Incrementing EDITLEVEL can be used to force invalidation of old bones
* and save files.
*/
#define EDITLEVEL 23
#define EDITLEVEL 24
#define COPYRIGHT_BANNER_A \
"NetHack, Copyright 1985-2005"