diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-09-25 05:57:53 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-09-25 06:00:13 +0200 |
| commit | 94e1b8560f1322a631eb42544ec432c0a9723dd7 (patch) | |
| tree | 90d500dddfa81cd9f4e47c20b1180f036a817f5d /crawl-ref/source/command.cc | |
| parent | 9ca6e02b50f1d4b23e9a3fdf1d2d45b021740294 (diff) | |
| parent | 9312efc0eb9066f0253d8e7d4cf38f33aeffc274 (diff) | |
| download | crawl-ref-94e1b8560f1322a631eb42544ec432c0a9723dd7.tar.gz crawl-ref-94e1b8560f1322a631eb42544ec432c0a9723dd7.zip | |
Merge branch 'next'
Diffstat (limited to 'crawl-ref/source/command.cc')
| -rw-r--r-- | crawl-ref/source/command.cc | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/crawl-ref/source/command.cc b/crawl-ref/source/command.cc index 7385a88dbf..f231f1e941 100644 --- a/crawl-ref/source/command.cc +++ b/crawl-ref/source/command.cc @@ -537,8 +537,9 @@ void list_jewellery(void) for (int i = EQ_LEFT_RING; i < NUM_EQUIP; i++) { - if ((you.species != SP_OCTOPODE && i > EQ_AMULET) - || (you.species == SP_OCTOPODE && i < EQ_AMULET)) + if ((you.species != SP_OCTOPODE && i > EQ_AMULET + || you.species == SP_OCTOPODE && i < EQ_AMULET) + && i != EQ_RING_AMULET) { continue; } @@ -547,18 +548,19 @@ void list_jewellery(void) int colour = MSGCOL_BLACK; const char *slot = - (i == EQ_LEFT_RING) ? "Left ring" : - (i == EQ_RIGHT_RING) ? "Right ring" : - (i == EQ_AMULET) ? "Amulet" : - (i == EQ_RING_ONE) ? "1st ring" : - (i == EQ_RING_TWO) ? "2nd ring" : - (i == EQ_RING_THREE) ? "3rd ring" : - (i == EQ_RING_FOUR) ? "4th ring" : - (i == EQ_RING_FIVE) ? "5th ring" : - (i == EQ_RING_SIX) ? "6th ring" : - (i == EQ_RING_SEVEN) ? "7th ring" : - (i == EQ_RING_EIGHT) ? "8th ring" - : "unknown"; + (i == EQ_LEFT_RING) ? "Left ring" : + (i == EQ_RIGHT_RING) ? "Right ring" : + (i == EQ_AMULET) ? "Amulet" : + (i == EQ_RING_ONE) ? "1st ring" : + (i == EQ_RING_TWO) ? "2nd ring" : + (i == EQ_RING_THREE) ? "3rd ring" : + (i == EQ_RING_FOUR) ? "4th ring" : + (i == EQ_RING_FIVE) ? "5th ring" : + (i == EQ_RING_SIX) ? "6th ring" : + (i == EQ_RING_SEVEN) ? "7th ring" : + (i == EQ_RING_EIGHT) ? "8th ring" : + (i == EQ_RING_AMULET) ? "Amulet ring" + : "unknown"; string item; if (jewellery_id != -1 && !you_tran_can_wear(you.inv[jewellery_id]) |