From: nethack.rankin <nethack.rankin>
Date: Thu, 6 Oct 2005 03:45:20 +0000 (+0000)
Subject: more monster alignment
X-Git-Tag: MOVE2GIT~1227
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a906215720121b53d0f69bead0d09086ef7cf1b4;p=nethack

more monster alignment

     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)
---

diff --git a/include/mondata.h b/include/mondata.h
index 81c0c86b1..9c63715f8 100644
--- a/include/mondata.h
+++ b/include/mondata.h
@@ -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				  */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -20,10 +20,7 @@
 #define resists_ston(mon)	(((mon)->mintrinsics & MR_STONE) != 0)
 
 #define is_lminion(mon)		(is_minion((mon)->data) && \
-				 (mon)->data->maligntyp >= A_COALIGNED && \
-				 ((mon)->data != &mons[PM_ANGEL] || \
-				  EPRI(mon)->shralign > 0))
-
+				 mon_aligntyp(mon) == A_LAWFUL)
 #define is_flyer(ptr)		(((ptr)->mflags1 & M1_FLY) != 0L)
 #define is_floater(ptr)		((ptr)->mlet == S_EYE)
 #define is_clinger(ptr)		(((ptr)->mflags1 & M1_CLING) != 0L)
diff --git a/src/mondata.c b/src/mondata.c
index 5f7d2ce80..9a219ac14 100644
--- a/src/mondata.c
+++ b/src/mondata.c
@@ -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. */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
-#include "eshk.h"
-#include "epri.h"
 
 /*	These routines provide basic data for any type of monster. */
 
diff --git a/src/monmove.c b/src/monmove.c
index f43549b6b..c757ec8b4 100644
--- a/src/monmove.c
+++ b/src/monmove.c
@@ -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. */
 /* NetHack may be freely redistributed.  See license for details. */
 
 #include "hack.h"
 #include "mfndpos.h"
 #include "artifact.h"
-#include "epri.h"
 
 extern boolean notonhead;
 
diff --git a/src/wizard.c b/src/wizard.c
index 8017a767c..62f5c3eb3 100644
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -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. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -9,7 +9,6 @@
 
 #include "hack.h"
 #include "qtext.h"
-#include "epri.h"
 
 extern const int monstr[];