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

pile_limit option - movement feedback "there are objects here" (trunk only)

Browse Source 
Something that pops up in the newsgroup periodically, with <Someone>
inevitably pointing out the bit of code that the user needs to tweak,
about control of feedback when hero is walking across floor objects.
Implement new option ``pile_limit'' which allows user to set the point
at which the game switches from listing the objects to giving "there are
several/many objects here".  Default is 5, same as previous hard-coded
value (1 object gets listed via pline, 2..4 are listed in a corner popup,
5 or more objects yields a pline message instead).  Setting pile_limit
to 0 means no limit, so objects will always be listed regardless of pile
size.  Setting it to 1 effectively forces no listing since any non-empty
pile size is always at least that big, so can produce "there is an object
here" even though that's no briefer than a pline() to show one object.
This commit is contained in:
nethack.rankin
2007-04-27 02:05:28 +00:00
parent ace5a30ab5
commit 94327317c2
8 changed files with 71 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/invent.c
+22 -11
View File
@@ -2336,7 +2336,7 @@ char *buf;
return dfeature;
}
/* look at what is here; if there are many objects (5 or more),
/* look at what is here; if there are many objects (pile_limit or more),
don't show them unless obj_cnt is 0 */
int
look_here(obj_cnt, picked_some)
@@ -2349,8 +2349,11 @@ boolean picked_some;
const char *dfeature = (char *)0;
char fbuf[BUFSZ], fbuf2[BUFSZ];
winid tmpwin;
boolean skip_objects = (obj_cnt >= 5), felt_cockatrice = FALSE;
boolean skip_objects, felt_cockatrice = FALSE;
/* default pile_limit is 5; a value of 0 means "never skip"
(and 1 effectively forces "always skip") */
skip_objects = (flags.pile_limit > 0 && obj_cnt >= flags.pile_limit);
if (u.uswallow && u.ustuck) {
struct monst *mtmp = u.ustuck;
Sprintf(fbuf, "Contents of %s %s",
@@ -2420,12 +2423,18 @@ boolean picked_some;
if (skip_objects) {
if (dfeature) pline(fbuf);
read_engr_at(u.ux, u.uy); /* Eric Backus */
There("are %s%s objects here.",
(obj_cnt <= 10) ? "several" : "many",
picked_some ? " more" : "");
if (obj_cnt == 1 && otmp->quan == 1L)
There("is %s object here.", picked_some ? "another" : "an");
else
There("are %s%s objects here.",
(obj_cnt < 5) ? "a few" :
(obj_cnt < 10) ? "several" : "many",
picked_some ? " more" : "");
for ( ; otmp; otmp = otmp->nexthere)
if (otmp->otyp == CORPSE && will_feel_cockatrice(otmp, FALSE)) {
pline("Including %s%s.",
pline("%s %s%s.",
(obj_cnt > 1) ? "Including" :
(otmp->quan > 1L) ? "They're" : "It's",
corpse_xname(otmp, (const char *)0, CXN_ARTICLE),
poly_when_stoned(youmonst.data) ? "" :
", unfortunately");
@@ -2442,20 +2451,22 @@ boolean picked_some;
You("%s here %s.", verb, doname(otmp));
if (otmp->otyp == CORPSE) feel_cockatrice(otmp, FALSE);
} else {
char buf[BUFSZ];
display_nhwindow(WIN_MESSAGE, FALSE);
tmpwin = create_nhwindow(NHW_MENU);
if(dfeature) {
putstr(tmpwin, 0, fbuf);
putstr(tmpwin, 0, "");
}
putstr(tmpwin, 0, Blind ? "Things that you feel here:" :
"Things that are here:");
Sprintf(buf, "%s that %s here:",
picked_some ? "Other things" : "Things",
Blind ? "you feel" : "are");
putstr(tmpwin, 0, buf);
for ( ; otmp; otmp = otmp->nexthere) {
if (otmp->otyp == CORPSE && will_feel_cockatrice(otmp, FALSE)) {
char buf[BUFSZ];
felt_cockatrice = TRUE;
Strcpy(buf, doname(otmp));
Strcat(buf, "...");
Sprintf(buf, "%s...", doname(otmp));
putstr(tmpwin, 0, buf);
break;
}