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

shk followmsg moved to instance globals. early_init introduced.

Browse Source
This commit is contained in:
Bart House
2018-12-25 17:46:52 -08:00
parent cfb0e3ef78
commit ed096f74c3
14 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/shk.c
View File

@@ -25,7 +25,6 @@ STATIC_DCL void FDECL(kops_gone, (BOOLEAN_P));
extern const struct shclass shtypes[]; /* defined in shknam.c */
STATIC_VAR NEARDATA long int followmsg; /* last time of follow message */
STATIC_VAR const char and_its_contents[] = " and its contents";
STATIC_VAR const char the_contents_of[] = "the contents of ";
@@ -3692,7 +3691,7 @@ struct monst *shkp;
eshkp->following = 0;
return 0;
}
if (g.moves > followmsg + 4) {
if (g.moves > g.followmsg + 4) {
if (!Deaf && !muteshk(shkp))
verbalize("%s, %s! Didn't you forget to pay?",
Hello(shkp), g.plname);
@@ -3700,7 +3699,7 @@ struct monst *shkp;
pline("%s holds out %s upturned %s.",
Shknam(shkp), noit_mhis(shkp),
mbodypart(shkp, HAND));
followmsg = g.moves;
g.followmsg = g.moves;
if (!rn2(9)) {
pline("%s doesn't like customers who don't pay.",
Shknam(shkp));