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

more monster alignment

Browse Source 
Simplify is_lminion(); as a result, several source files no longer
need access to epri.h.  (mondata.c already could have lived without it;
eshk.h as well.)

Makefile dependency changes:
  mondata.{c,o} -- doesn't need epri.h or eshk.h
  monmove.{c,o} -- doesn't need epri.h
  wizard.{c,o}  -- ditto
  pline.{c,o}   -- ditto (yesterday's patch)
This commit is contained in:
nethack.rankin
2005-10-06 03:45:20 +00:00
parent 5ffa09c388
commit a906215720
4 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mondata.h
+2 -5
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)mondata.h 3.5 2005/01/31 */ /* SCCS Id: @(#)mondata.h 3.5 2005/10/05 */
/* Copyright (c) 1989 Mike Threepoint */ /* Copyright (c) 1989 Mike Threepoint */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -20,10 +20,7 @@
#define resists_ston(mon) (((mon)->mintrinsics & MR_STONE) != 0) #define resists_ston(mon) (((mon)->mintrinsics & MR_STONE) != 0)
#define is_lminion(mon) (is_minion((mon)->data) && \ #define is_lminion(mon) (is_minion((mon)->data) && \
(mon)->data->maligntyp >= A_COALIGNED && \ mon_aligntyp(mon) == A_LAWFUL)
((mon)->data != &mons[PM_ANGEL] || \
EPRI(mon)->shralign > 0))
#define is_flyer(ptr) (((ptr)->mflags1 & M1_FLY) != 0L) #define is_flyer(ptr) (((ptr)->mflags1 & M1_FLY) != 0L)
#define is_floater(ptr) ((ptr)->mlet == S_EYE) #define is_floater(ptr) ((ptr)->mlet == S_EYE)
#define is_clinger(ptr) (((ptr)->mflags1 & M1_CLING) != 0L) #define is_clinger(ptr) (((ptr)->mflags1 & M1_CLING) != 0L)
src/mondata.c
+1 -3
View File
@@ -1,10 +1,8 @@
/* SCCS Id: @(#)mondata.c 3.5 2005/09/01 */ /* SCCS Id: @(#)mondata.c 3.5 2005/10/05 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
#include "hack.h" #include "hack.h"
#include "eshk.h"
#include "epri.h"
/* These routines provide basic data for any type of monster. */ /* These routines provide basic data for any type of monster. */
src/monmove.c
+1 -2
View File
@@ -1,11 +1,10 @@
/* SCCS Id: @(#)monmove.c 3.5 2005/06/22 */ /* SCCS Id: @(#)monmove.c 3.5 2005/10/05 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
#include "hack.h" #include "hack.h"
#include "mfndpos.h" #include "mfndpos.h"
#include "artifact.h" #include "artifact.h"
#include "epri.h"
extern boolean notonhead; extern boolean notonhead;
src/wizard.c
+1 -2
View File
@@ -1,4 +1,4 @@
/* SCCS Id: @(#)wizard.c 3.5 2005/03/19 */ /* SCCS Id: @(#)wizard.c 3.5 2005/10/05 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */ /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */ /* NetHack may be freely redistributed. See license for details. */
@@ -9,7 +9,6 @@
#include "hack.h" #include "hack.h"
#include "qtext.h" #include "qtext.h"
#include "epri.h"
extern const int monstr[]; extern const int monstr[];