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

Deprecate "makedefs -m".

Browse Source 
mons[].difficulty takes over for monstr[]
Invoking "makedefs -m" gives a deprecation message; it is also included
in the (now mostly empty) monstr.c.
Ports should now remove "makedefs -m" from their build procedures but this
commit does not include that change.
This commit is contained in:
keni
2018-10-17 15:37:24 -04:00
parent b9d99b343d
commit f222023bd8
9 changed files with 445 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pray.c
View File

@@ -1,4 +1,4 @@
/* NetHack 3.6 pray.c $NHDT-Date: 1519662898 2018/02/26 16:34:58 $ $NHDT-Branch: NetHack-3.6.0 $:$NHDT-Revision: 1.96 $ */
/* NetHack 3.6 pray.c $NHDT-Date: 1539804904 2018/10/17 19:35:04 $ $NHDT-Branch: keni-makedefsm $:$NHDT-Revision: 1.103 $ */
/* Copyright (c) Benson I. Margulies, Mike Stephenson, Steve Linhart, 1989. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1325,7 +1325,6 @@ dosacrifice()
if (otmp->otyp == CORPSE) {
register struct permonst *ptr = &mons[otmp->corpsenm];
struct monst *mtmp;
extern const int monstr[];
/* KMH, conduct */
u.uconduct.gnostic++;
@@ -1338,7 +1337,7 @@ dosacrifice()
if (otmp->corpsenm == PM_ACID_BLOB
|| (monstermoves <= peek_at_iced_corpse_age(otmp) + 50)) {
value = monstr[otmp->corpsenm] + 1;
value = mons[otmp->corpsenm].difficulty + 1;
if (otmp->oeaten)
value = eaten_stat(value, otmp);
}