Skip to content

Commit

Permalink
charging rings
Browse files Browse the repository at this point in the history
     Reported--more or less--by <email deleted>:
chargeable rings don't show up as likely candidates in the "what do you
want to charge?" prompt.  They're supposed to be there once the type has
been discovered but it was using the wrong field so basing that on whether
the player had assigned a name to the type instead.  (Picking a chargeable
ring's letter even though it wasn't listed did work correctly though.)
  • Loading branch information
nethack.rankin committed Apr 20, 2007
1 parent 933c184 commit ae36e5b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
1 change: 1 addition & 0 deletions doc/fixes34.4
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@ use a more precise jumping path for far, non-straight line destinations
increase damage bonus applies when kicking while polymorphed into a monster
form which has a kicking attack, just like for other kicks
if magically removing steed's saddle is fatal, don't leave it saddled in bones
charging prompt used wrong criteria when deciding whether to list rings


Platform- and/or Interface-Specific Fixes
Expand Down
5 changes: 3 additions & 2 deletions src/read.c
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,11 @@ is_chargeable(obj)
struct obj *obj;
{
if (obj->oclass == WAND_CLASS) return TRUE;
/* known && !uname is possible after amnesia/mind flayer */
/* known && !oc_name_known is possible after amnesia/mind flayer */
if (obj->oclass == RING_CLASS)
return (boolean)(objects[obj->otyp].oc_charged &&
(obj->known || objects[obj->otyp].oc_uname));
(obj->known ||
(obj->dknown && objects[obj->otyp].oc_name_known)));
if (is_weptool(obj)) /* specific check before general tools */
return FALSE;
if (obj->oclass == TOOL_CLASS)
Expand Down

0 comments on commit ae36e5b

Please sign in to comment.