diff --git a/doc/fixes3-7-0.txt b/doc/fixes3-7-0.txt index c9e0cb3d8..e9f7289bb 100644 --- a/doc/fixes3-7-0.txt +++ b/doc/fixes3-7-0.txt @@ -2375,7 +2375,8 @@ allow #dip potions into a sink to get a hint about what they are, similar to when restoring, show current level's player-applied annotation if there is one have farlook of a grave report the engraving on the headstone if it's known the '*' command (list inventory items in use) now shows items in a specific - order: amulet, right ring, left ring, blindfold, wielded weapon, + order: amulet, ring on main hand (potentially affected by cursed + one-handed weapon), ring on off hand, blindfold, wielded weapon, secondary or alternate weapon, quiver, suit, cloak, shield, helmet, gloves, boots, shirt, lit lamps and candles, leashes attached to pets instead of by object class (sortpack) or inventory letter (!sortpack); diff --git a/src/invent.c b/src/invent.c index b6943b958..a6dc1a460 100644 --- a/src/invent.c +++ b/src/invent.c @@ -132,8 +132,8 @@ inuse_classify(Loot *sort_item, struct obj *obj) /* "Accessories" */ ++altclass; /* 4 */ USE_RATING(w_mask & WORN_BLINDF); - USE_RATING(w_mask & LEFT_RING); - USE_RATING(w_mask & RIGHT_RING); + USE_RATING(w_mask & (ULEFTY ? RIGHT_RING : LEFT_RING)); /* off hand */ + USE_RATING(w_mask & (URIGHTY ? RIGHT_RING : LEFT_RING)); /* main hand */ USE_RATING(w_mask & WORN_AMUL); /* if we get here, the USE_RATING() checks failed to find a match */ diff --git a/src/zap.c b/src/zap.c index 0a66af4da..498cda023 100644 --- a/src/zap.c +++ b/src/zap.c @@ -4011,10 +4011,9 @@ boomhit(struct obj *obj, coordxy dx, coordxy dy) register int i, ct; int boom; /* showsym[] index */ struct monst *mtmp; - boolean counterclockwise = URIGHTY; /* URIGHTY = right-handed throw - else ULEFTY = left-handed throw */ + boolean counterclockwise = URIGHTY; /* ULEFTY => clockwise */ - /* counterclockwise traversal patterns: + /* counterclockwise traversal patterns, from @ to 1 then on through to 9 * ..........................54................................. * ..................43.....6..3....765......................... * ..........32.....5..2...7...2...8...4....87..................