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

Requiver pickup_thrown objects if quiver is empty

Browse Source 
Change via Dynahack by Tung Nguyen
This commit is contained in:
Pasi Kallinen
2016-01-06 00:52:51 +02:00
parent 192d1bd89e
commit e92b80b2ab
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
doc/fixes36.1
View File

@@ -83,6 +83,7 @@ fix "killing by kicking something weird" when kicking an object causes death
guard macros available for mextra fields similar to those for oextra fields
compile-time option for an alternate paniclog format for public server use
make monsters forget where they stepped when fleeing or teleporting
requiver pickup_thrown objects if quiver is empty
Platform- and/or Interface-Specific Fixes

5
src/invent.c
View File

@@ -434,6 +434,7 @@ struct obj *obj;
{
struct obj *otmp, *prev;
int saved_otyp = (int) obj->otyp; /* for panic */
boolean obj_was_thrown;
if (obj->where != OBJ_FREE)
panic("addinv: obj not free");
@@ -442,6 +443,7 @@ struct obj *obj;
obj->no_charge = 0; /* should not be set in hero's invent */
if (Has_contents(obj))
picked_container(obj); /* clear no_charge */
obj_was_thrown = obj->was_thrown;
obj->was_thrown = 0; /* not meaningful for invent */
addinv_core1(obj);
@@ -476,6 +478,9 @@ struct obj *obj;
}
obj->where = OBJ_INVENT;
/* fill empty quiver if obj was thrown */
if (flags.pickup_thrown && !uquiver && obj_was_thrown)
setuqwep(obj);
added:
addinv_core2(obj);
carry_obj_effects(obj); /* carrying affects the obj */