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

Use encumbrance prefix in pickup_object when above burdened also

Browse Source
This commit is contained in:
Andrio Celos
2023-11-20 13:21:36 -08:00
committed by PatR
parent f2f4fa06dd
commit b4aee17578
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pickup.c
+7 -2
View File
@@ -1716,6 +1716,7 @@ pickup_object(
boolean telekinesis) /* not picking it up directly by hand */ boolean telekinesis) /* not picking it up directly by hand */
{ {
int res, nearload; int res, nearload;
const char* prefix;
if (obj->quan < count) { if (obj->quan < count) {
impossible("pickup_object: count %ld > quan %ld?", count, obj->quan); impossible("pickup_object: count %ld > quan %ld?", count, obj->quan);
@@ -1785,8 +1786,12 @@ pickup_object(
if (uwep && uwep == obj) if (uwep && uwep == obj)
gm.mrg_to_wielded = TRUE; gm.mrg_to_wielded = TRUE;
nearload = near_capacity(); nearload = near_capacity();
prinv(nearload == SLT_ENCUMBER ? moderateloadmsg : (char *) 0, obj, prefix = (nearload >= EXT_ENCUMBER) ? overloadmsg
count); : (nearload >= HVY_ENCUMBER) ? nearloadmsg
: (nearload >= MOD_ENCUMBER) ? moderateloadmsg
: (nearload >= SLT_ENCUMBER) ? slightloadmsg
: (char *) 0;
prinv(prefix, obj, count);
gm.mrg_to_wielded = FALSE; gm.mrg_to_wielded = FALSE;
return 1; return 1;
} }