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

name_to_monclass (trunk only)

Browse Source 
Move the code for determining monster class from user's input string
out of do_class_genocide() and into new routine name_to_monclass().  I'm
planning to use it when name_to_mon fails to match anything for controlled
polymorph (not ready for prime time yet).

     Also, avoid getting stuck in a loop if hangup occurs while prompting
player for class of monster to genocide.  ESC, whether deliberate or fake
input after hangup, will now be the same as specifying "none", throwing
away the genocide opportunity.
This commit is contained in:
nethack.rankin
2007-04-08 04:35:19 +00:00
parent 3c58c3b235
commit 95d693a84c
4 changed files with 96 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/read.c
View File

@@ -1,4 +1,4 @@
/* SCCS Id: @(#)read.c 3.5 2006/06/13 */
/* SCCS Id: @(#)read.c 3.5 2007/04/07 */
/* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
/* NetHack may be freely redistributed. See license for details. */
@@ -1605,61 +1605,28 @@ do_class_genocide()
getlin("What class of monsters do you wish to genocide?",
buf);
(void)mungspaces(buf);
} while (buf[0]=='\033' || !buf[0]);
if (*buf == '\033') Strcpy(buf, "none"); /* hangup? */
} while (!*buf);
/* choosing "none" preserves genocideless conduct */
if (!strcmpi(buf, "none") ||
!strcmpi(buf, "nothing")) return;
if (strlen(buf) == 1) {
if (buf[0] == ILLOBJ_SYM)
buf[0] = def_monsyms[S_MIMIC].sym;
class = def_char_to_monclass(buf[0]);
} else {
char buf2[BUFSZ];
class = 0;
Strcpy(buf2, makesingular(buf));
Strcpy(buf, buf2);
}
class = name_to_monclass(buf, (int *)0);
if (class == 0 && (i = name_to_mon(buf)) != NON_PM)
class = mons[i].mlet;
immunecnt = gonecnt = goodcnt = 0;
for (i = LOW_PM; i < NUMMONS; i++) {
if (class == 0 &&
strstri(def_monsyms[(int)mons[i].mlet].explain, buf) != 0)
class = mons[i].mlet;
if (mons[i].mlet == class) {
if (!(mons[i].geno & G_GENO)) immunecnt++;
else if(mvitals[i].mvflags & G_GENOD) gonecnt++;
else goodcnt++;
}
}
/*
* If user's input doesn't match any class
* description, check individual species names.
*/
if (class == 0) {
for (i = LOW_PM; i < NUMMONS; i++) {
if (strstri(mons[i].mname, buf) != 0) {
class = mons[i].mlet;
break;
}
}
if (class != 0) {
for (i = LOW_PM; i < NUMMONS; i++) {
if (mons[i].mlet == class) {
if (!(mons[i].geno & G_GENO)) immunecnt++;
else if(mvitals[i].mvflags & G_GENOD) gonecnt++;
else goodcnt++;
}
}
}
}
if (!goodcnt && class != mons[urole.malenum].mlet &&
class != mons[urace.malenum].mlet) {
if (gonecnt)
pline("All such monsters are already nonexistent.");
else if (immunecnt ||
(buf[0] == DEF_INVISIBLE && buf[1] == '\0'))
else if (immunecnt || class == S_invisible)
You("aren't permitted to genocide such monsters.");
else
#ifdef WIZARD /* to aid in topology testing; remove pesky monsters */