[Refactor] 無駄な空白、改行の削除、includeのソート

[hengbandforosx/hengbandosx.git] / src / flavor / flavor-describer.c

diff --git a/src/flavor/flavor-describer.c b/src/flavor/flavor-describer.c
index 12902b5..94436d3 100644 (file)
--- a/src/flavor/flavor-describer.c
+++ b/src/flavor/flavor-describer.c
@@ -26,6 +26,7 @@
 #include "object/object-kind.h"
 #include "perception/object-perception.h"
 #include "player/player-status-table.h"
+#include "specific-object/bow.h"
 #include "sv-definition/sv-lite-types.h"
 #include "util/bit-flags-calculator.h"
 #include "util/string-processor.h"
@@ -367,6 +368,8 @@ static void describe_specific_pval(flavor_type *flavor_ptr)
         if (ABS(flavor_ptr->o_ptr->pval) != 1)
             flavor_ptr->t = object_desc_chr(flavor_ptr->t, 's');
 #endif
+
+        return;
     }
 
     if (has_flag(flavor_ptr->tr_flags, TR_STEALTH)) {
@@ -442,24 +445,24 @@ static void decide_item_feeling(flavor_type *flavor_ptr)
         strcpy(flavor_ptr->fake_insc_buf, game_inscriptions[flavor_ptr->o_ptr->feeling]);
         return;
     }
-    
+
     if (object_is_cursed(flavor_ptr->o_ptr) && (flavor_ptr->known || (flavor_ptr->o_ptr->ident & IDENT_SENSE))) {
         strcpy(flavor_ptr->fake_insc_buf, _("呪われている", "cursed"));
         return;
     }
-    
+
     if (((flavor_ptr->o_ptr->tval == TV_RING) || (flavor_ptr->o_ptr->tval == TV_AMULET) || (flavor_ptr->o_ptr->tval == TV_LITE)
-                 || (flavor_ptr->o_ptr->tval == TV_FIGURINE))
+            || (flavor_ptr->o_ptr->tval == TV_FIGURINE))
         && flavor_ptr->aware && !flavor_ptr->known && !(flavor_ptr->o_ptr->ident & IDENT_SENSE)) {
         strcpy(flavor_ptr->fake_insc_buf, _("未鑑定", "unidentified"));
         return;
     }
-    
+
     if (!flavor_ptr->known && (flavor_ptr->o_ptr->ident & IDENT_EMPTY)) {
         strcpy(flavor_ptr->fake_insc_buf, _("空", "empty"));
         return;
     }
-    
+
     if (!flavor_ptr->aware && object_is_tried(flavor_ptr->o_ptr))
         strcpy(flavor_ptr->fake_insc_buf, _("未判明", "tried"));
 }
@@ -487,7 +490,7 @@ void describe_flavor(player_type *player_ptr, char *buf, object_type *o_ptr, BIT
     describe_tval(player_ptr, flavor_ptr);
     describe_named_item_tval(flavor_ptr);
     flavor_ptr->bow_ptr = &player_ptr->inventory_list[INVEN_BOW];
-    if ((flavor_ptr->bow_ptr->k_idx != 0) && (flavor_ptr->o_ptr->tval == player_ptr->tval_ammo))
+    if ((flavor_ptr->bow_ptr->k_idx != 0) && (flavor_ptr->o_ptr->tval == bow_tval_ammo(flavor_ptr->bow_ptr)))
         describe_bow_power(player_ptr, flavor_ptr);
     else if ((player_ptr->pclass == CLASS_NINJA) && (flavor_ptr->o_ptr->tval == TV_SPIKE))
         describe_spike_power(player_ptr, flavor_ptr);
@@ -509,4 +512,4 @@ void describe_flavor(player_type *player_ptr, char *buf, object_type *o_ptr, BIT
     display_item_discount(flavor_ptr);
     display_item_fake_inscription(flavor_ptr);
     angband_strcpy(flavor_ptr->buf, flavor_ptr->tmp_val, MAX_NLEN);
-}
+}
\ No newline at end of file