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

Add "user canceled" as extended command return value

Browse Source 
Instead of returning ECMD_OK, the commands now return ECMD_CANCEL
when user declined to pick a direction or an object to act on.

Note that this can be ORed with ECMD_TIME, if the command still
took a turn.

For now this has no gameplay meaning.
This commit is contained in:
Pasi Kallinen
2022-01-08 20:04:54 +02:00
parent bcccfaaeac
commit 68b822e4dc
22 changed files with 78 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/potion.c
View File

@@ -534,7 +534,7 @@ dodrink(void)
otmp = getobj("drink", drink_ok, GETOBJ_NOFLAGS);
if (!otmp)
return ECMD_OK;
return ECMD_CANCEL;
/* quan > 1 used to be left to useup(), but we need to force
the current potion to be unworn, and don't want to do
@@ -2142,7 +2142,7 @@ dodip(void)
const char *shortestname; /* last resort obj name for prompt */
if (!(obj = getobj("dip", dip_ok, GETOBJ_PROMPT)))
return ECMD_OK;
return ECMD_CANCEL;
if (inaccessible_equipment(obj, "dip", FALSE))
return ECMD_OK;
@@ -2198,7 +2198,7 @@ dodip(void)
flags.verbose ? obuf : shortestname);
potion = getobj(qbuf, drink_ok, GETOBJ_NOFLAGS);
if (!potion)
return ECMD_OK;
return ECMD_CANCEL;
if (potion == obj && potion->quan == 1L) {
pline("That is a potion bottle, not a Klein bottle!");
return ECMD_OK;