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

setuwep, et al, cleanup

Browse Source
This commit is contained in:
cohrs
2002-01-10 06:52:05 +00:00
parent 46bd9b925c
commit 631df10a34
6 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/do_wear.c
+7 -4
View File
@@ -635,10 +635,9 @@ register struct obj *obj;
long oldprop = u.uprops[objects[obj->otyp].oc_oprop].extrinsic;
int old_attrib;
if (obj == uwep) setuwep((struct obj *) 0);
if (obj == uswapwep) setuswapwep((struct obj *) 0);
if (obj == uquiver) setuqwep((struct obj *) 0);
if (obj == uwep) setuwep((struct obj *) 0);
if (obj == uswapwep) setuswapwep((struct obj *) 0);
if (obj == uquiver) setuqwep((struct obj *) 0);
/* only mask out W_RING when we don't have both
left and right rings of the same type */
@@ -1417,6 +1416,10 @@ doputon()
}
if(otmp == uwep)
setuwep((struct obj *)0);
if(otmp == uswapwep)
setuswapwep((struct obj *) 0);
if(otmp == uquiver)
setuqwep((struct obj *) 0);
if(otmp->oclass == RING_CLASS || otmp->otyp == MEAT_RING) {
if(nolimbs(youmonst.data)) {
You("cannot make the ring stick to your body.");