X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=src%2Fobject-enchant%2Fobject-curse.c;h=729e8cbc844fa377d5544d0811786cf7350a40d9;hb=d08332ea44d56e1ee0200e03eb73bb777ef677fd;hp=a91ec081c3d95c7dd8a53adea0c3c637a5c39743;hpb=adfd0a10b3e0c745b0c7bab5301d647bcd2abe44;p=hengband%2Fhengband.git

diff --git a/src/object-enchant/object-curse.c b/src/object-enchant/object-curse.c
index a91ec081c..729e8cbc8 100644
--- a/src/object-enchant/object-curse.c
+++ b/src/object-enchant/object-curse.c
@@ -1,5 +1,7 @@
 #include "object-enchant/object-curse.h"
 #include "core/player-update-types.h"
+#include "flavor/flavor-describer.h"
+#include "flavor/object-flavor-types.h"
 #include "inventory/inventory-slot-types.h"
 #include "object-enchant/item-feeling.h"
 #include "object-enchant/tr-types.h"
@@ -9,7 +11,6 @@
 #include "object-hook/hook-enchant.h"
 #include "object-hook/hook-weapon.h"
 #include "object/object-flags.h"
-#include "object/object-flavor.h"
 #include "util/bit-flags-calculator.h"
 #include "view/display-messages.h"
 
@@ -25,33 +26,31 @@
  */
 BIT_FLAGS get_curse(player_type *owner_ptr, int power, object_type *o_ptr)
 {
-	BIT_FLAGS new_curse;
+    BIT_FLAGS new_curse;
 
-	while (TRUE)
-	{
-		new_curse = (1 << (randint0(MAX_CURSE)+4));
-		if (power == 2)
-		{
-			if (!(new_curse & TRC_HEAVY_MASK)) continue;
-		}
-		else if (power == 1)
-		{
-			if (new_curse & TRC_SPECIAL_MASK) continue;
-		}
-		else if (power == 0)
-		{
-			if (new_curse & TRC_HEAVY_MASK) continue;
-		}
+    while (TRUE) {
+        new_curse = (1 << (randint0(MAX_CURSE) + 4));
+        if (power == 2) {
+            if (!(new_curse & TRC_HEAVY_MASK))
+                continue;
+        } else if (power == 1) {
+            if (new_curse & TRC_SPECIAL_MASK)
+                continue;
+        } else if (power == 0) {
+            if (new_curse & TRC_HEAVY_MASK)
+                continue;
+        }
 
-		if (new_curse == TRC_LOW_MELEE && !object_is_weapon(owner_ptr, o_ptr)) continue;
-		if (new_curse == TRC_LOW_AC && !object_is_armour(owner_ptr, o_ptr)) continue;
-		break;
-	}
+        if (new_curse == TRC_LOW_MELEE && !object_is_weapon(owner_ptr, o_ptr))
+            continue;
+        if (new_curse == TRC_LOW_AC && !object_is_armour(owner_ptr, o_ptr))
+            continue;
+        break;
+    }
 
-	return new_curse;
+    return new_curse;
 }
 
-
 /*!
  * @brief 装備への呪い付加判定と付加処理
  * @param owner_ptr プレーヤーへの参照ポインタ
@@ -61,59 +60,55 @@ BIT_FLAGS get_curse(player_type *owner_ptr, int power, object_type *o_ptr)
  */
 void curse_equipment(player_type *owner_ptr, PERCENTAGE chance, PERCENTAGE heavy_chance)
 {
-	if (randint1(100) > chance) return;
+    if (randint1(100) > chance)
+        return;
 
-	object_type *o_ptr = &owner_ptr->inventory_list[INVEN_RARM + randint0(12)];
-	if (!o_ptr->k_idx) return;
-	BIT_FLAGS oflgs[TR_FLAG_SIZE];
-	object_flags(owner_ptr, o_ptr, oflgs);
-	GAME_TEXT o_name[MAX_NLEN];
-	object_desc(owner_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
+    object_type *o_ptr = &owner_ptr->inventory_list[INVEN_RARM + randint0(12)];
+    if (!o_ptr->k_idx)
+        return;
+    BIT_FLAGS oflgs[TR_FLAG_SIZE];
+    object_flags(owner_ptr, o_ptr, oflgs);
+    GAME_TEXT o_name[MAX_NLEN];
+    describe_flavor(owner_ptr, o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
 
-	/* Extra, biased saving throw for blessed items */
-	if (have_flag(oflgs, TR_BLESSED))
-	{
+    /* Extra, biased saving throw for blessed items */
+    if (has_flag(oflgs, TR_BLESSED)) {
 #ifdef JP
-		msg_format("祝福された%sは呪いを跳ね返した！", o_name);
+        msg_format("祝福された%sは呪いを跳ね返した！", o_name);
 #else
-		msg_format("Your blessed %s resist%s cursing!", o_name, ((o_ptr->number > 1) ? "" : "s"));
+        msg_format("Your blessed %s resist%s cursing!", o_name, ((o_ptr->number > 1) ? "" : "s"));
 #endif
-		/* Hmmm -- can we wear multiple items? If not, this is unnecessary */
-		return;
-	}
+        /* Hmmm -- can we wear multiple items? If not, this is unnecessary */
+        return;
+    }
 
-	bool changed = FALSE;
-	int curse_power = 0;
-	if ((randint1(100) <= heavy_chance) &&
-	    (object_is_artifact(o_ptr) || object_is_ego(o_ptr)))
-	{
-		if (!(o_ptr->curse_flags & TRC_HEAVY_CURSE))
-			changed = TRUE;
-		o_ptr->curse_flags |= TRC_HEAVY_CURSE;
-		o_ptr->curse_flags |= TRC_CURSED;
-		curse_power++;
-	}
-	else
-	{
-		if (!object_is_cursed(o_ptr))
-			changed = TRUE;
-		o_ptr->curse_flags |= TRC_CURSED;
-	}
+    bool changed = FALSE;
+    int curse_power = 0;
+    if ((randint1(100) <= heavy_chance) && (object_is_artifact(o_ptr) || object_is_ego(o_ptr))) {
+        if (!(o_ptr->curse_flags & TRC_HEAVY_CURSE))
+            changed = TRUE;
+        o_ptr->curse_flags |= TRC_HEAVY_CURSE;
+        o_ptr->curse_flags |= TRC_CURSED;
+        curse_power++;
+    } else {
+        if (!object_is_cursed(o_ptr))
+            changed = TRUE;
+        o_ptr->curse_flags |= TRC_CURSED;
+    }
 
-	if (heavy_chance >= 50) curse_power++;
+    if (heavy_chance >= 50)
+        curse_power++;
 
-	BIT_FLAGS new_curse = get_curse(owner_ptr, curse_power, o_ptr);
-	if (!(o_ptr->curse_flags & new_curse))
-	{
-		changed = TRUE;
-		o_ptr->curse_flags |= new_curse;
-	}
+    BIT_FLAGS new_curse = get_curse(owner_ptr, curse_power, o_ptr);
+    if (!(o_ptr->curse_flags & new_curse)) {
+        changed = TRUE;
+        o_ptr->curse_flags |= new_curse;
+    }
 
-	if (changed)
-	{
-		msg_format(_("悪意に満ちた黒いオーラが%sをとりまいた...", "There is a malignant black aura surrounding %s..."), o_name);
-		o_ptr->feeling = FEEL_NONE;
-	}
+    if (changed) {
+        msg_format(_("悪意に満ちた黒いオーラが%sをとりまいた...", "There is a malignant black aura surrounding %s..."), o_name);
+        o_ptr->feeling = FEEL_NONE;
+    }
 
-	owner_ptr->update |= PU_BONUS;
+    owner_ptr->update |= PU_BONUS;
 }