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

Minor reformat, fix warnings

Browse Source
This commit is contained in:
Pasi Kallinen
2017-09-14 14:40:11 +03:00
parent 0753a0751e
commit cfedd8659d
2 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/detect.c
View File

@@ -1571,9 +1571,9 @@ boolean via_warning;
Blind ? "to check nearby" : "look close by"); Blind ? "to check nearby" : "look close by");
display_nhwindow(WIN_MESSAGE, FALSE); /* flush messages */ display_nhwindow(WIN_MESSAGE, FALSE); /* flush messages */
} }
mtmp->mundetected = 0; mtmp->mundetected = 0;
newsym(x, y); newsym(x, y);
goto find; goto find;
} }
return 0; return 0;
} }

21
src/pickup.c
View File

@@ -2348,13 +2348,18 @@ explain_container_prompt(more_containers)
boolean more_containers; boolean more_containers;
{ {
static const char *const explaintext[] = { static const char *const explaintext[] = {
"Container actions:", "", " : -- Look: examine contents", "Container actions:",
" o -- Out: take things out", " i -- In: put things in", "",
" : -- Look: examine contents",
" o -- Out: take things out",
" i -- In: put things in",
" b -- Both: first take things out, then put things in", " b -- Both: first take things out, then put things in",
" r -- Reversed: put things in, then take things out", " r -- Reversed: put things in, then take things out",
" s -- Stash: put one item in", "", " s -- Stash: put one item in", "",
" n -- Next: loot next selected container", " q -- Quit: finished", " n -- Next: loot next selected container",
" ? -- Help: display this text.", "", 0 " q -- Quit: finished",
" ? -- Help: display this text.",
"", 0
}; };
const char *const *txtpp; const char *const *txtpp;
winid win; winid win;
@@ -2392,7 +2397,7 @@ struct obj **objp;
int held; int held;
boolean more_containers; /* True iff #loot multiple and this isn't last one */ boolean more_containers; /* True iff #loot multiple and this isn't last one */
{ {
struct obj *curr, *otmp, *obj = *objp; struct obj *otmp, *obj = *objp;
boolean quantum_cat, cursed_mbag, loot_out, loot_in, loot_in_first, boolean quantum_cat, cursed_mbag, loot_out, loot_in, loot_in_first,
stash_one, inokay, outokay, outmaybe; stash_one, inokay, outokay, outmaybe;
char c, emptymsg[BUFSZ], qbuf[QBUFSZ], pbuf[QBUFSZ], xbuf[QBUFSZ]; char c, emptymsg[BUFSZ], qbuf[QBUFSZ], pbuf[QBUFSZ], xbuf[QBUFSZ];
@@ -2439,7 +2444,11 @@ boolean more_containers; /* True iff #loot multiple and this isn't last one */
used = 1; used = 1;
} }
if ((loss = boh_loss(current_container, held)) != 0) { cursed_mbag = Is_mbag(current_container)
&& current_container->cursed
&& Has_contents(current_container);
if (cursed_mbag
&& (loss = boh_loss(current_container, held)) != 0) {
used = 1; used = 1;
You("owe %ld %s for lost merchandise.", loss, currency(loss)); You("owe %ld %s for lost merchandise.", loss, currency(loss));
current_container->owt = weight(current_container); current_container->owt = weight(current_container);