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

Merge branch 'master' into win32-x64-working

Browse Source 
Conflicts:
	include/extern.h
	src/do.c
	src/mon.c

 Changes to be committed:
	modified:   include/extern.h
	modified:   src/ball.c
	modified:   src/do.c
	modified:   src/eat.c
	modified:   src/hack.c
	modified:   src/invent.c
	modified:   src/lock.c
	modified:   src/mon.c
	modified:   src/pickup.c
	modified:   src/pline.c
	modified:   src/save.c
	modified:   src/sp_lev.c
	modified:   src/steed.c
	modified:   src/trap.c
	modified:   src/uhitm.c
This commit is contained in:
nhmall
2015-04-22 08:08:50 -04:00
parent 3238303dc8 ed164ad324
commit c78d09a7d4
15 changed files with 167 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/pickup.c
View File

@@ -2098,6 +2098,19 @@ explain_container_prompt()
}
}
boolean
u_handsy()
{
if (nohands(youmonst.data)) {
You("have no hands!"); /* not `body_part(HAND)' */
return FALSE;
} else if (!freehand()) {
You("have no free %s.", body_part(HAND));
return FALSE;
}
return TRUE;
}
static const char stashable[] = { ALLOW_COUNT, COIN_CLASS, ALL_CLASSES, 0 };
int
@@ -2114,13 +2127,9 @@ int held;
int used = 0;
emptymsg[0] = '\0';
if (nohands(youmonst.data)) {
You("have no hands!"); /* not `body_part(HAND)' */
return 0;
} else if (!freehand()) {
You("have no free %s.", body_part(HAND));
return 0;
}
if (!u_handsy()) return 0;
if (obj->olocked) {
pline("%s locked.", Tobjnam(obj, "are"));
if (held) You("must put it down to unlock.");