[Fix] #38997 curse_weapon()のシンタックスシュガーを削除 / Removed syntax sugar 'curse_weapon()'

diff --git a/src/cmd/cmd-read.c b/src/cmd/cmd-read.c
index c4517f4..85e416f 100644 (file)
--- a/src/cmd/cmd-read.c
+++ b/src/cmd/cmd-read.c
@@ -113,7 +113,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known)
                                if (has_melee_weapon(creature_ptr, INVEN_LARM) && one_in_(2)) k = INVEN_LARM;
                        }
                        else if (has_melee_weapon(creature_ptr, INVEN_LARM)) k = INVEN_LARM;
-                       if (k && curse_weapon(FALSE, k)) ident = TRUE;
+                       if (k && curse_weapon_object(creature_ptr, FALSE, &creature_ptr->inventory_list[k])) ident = TRUE;
                        break;
                }
 

diff --git a/src/patron.c b/src/patron.c
index 79705ab..32357ee 100644 (file)
--- a/src/patron.c
+++ b/src/patron.c
@@ -502,7 +502,7 @@ void gain_level_reward(player_type *creature_ptr, int chosen_reward)
                                if (has_melee_weapon(creature_ptr, INVEN_RARM) && one_in_(2)) dummy = INVEN_RARM;
                        }
                        object_desc(o_name, &creature_ptr->inventory_list[dummy], OD_NAME_ONLY);
-                       (void)curse_weapon(FALSE, dummy);
+                       (void)curse_weapon_object(creature_ptr, FALSE, &creature_ptr->inventory_list[dummy]);
                        reward = format(_("%sが破壊された。", "destroying %s"), o_name);
                        break;
 
@@ -543,7 +543,7 @@ void gain_level_reward(player_type *creature_ptr, int chosen_reward)
                                                if (has_melee_weapon(creature_ptr, INVEN_RARM) && one_in_(2)) dummy = INVEN_RARM;
                                        }
                                        object_desc(o_name, &creature_ptr->inventory_list[dummy], OD_NAME_ONLY);
-                                       (void)curse_weapon(FALSE, dummy);
+                                       (void)curse_weapon_object(creature_ptr, FALSE, &creature_ptr->inventory_list[dummy]);
                                        reward = format(_("%sが破壊された。", "destroying %s"), o_name);
                                }
                                else
@@ -587,7 +587,7 @@ void gain_level_reward(player_type *creature_ptr, int chosen_reward)
                                }
                                else if (has_melee_weapon(creature_ptr, INVEN_LARM)) dummy = INVEN_LARM;
 
-                               if (dummy) (void)curse_weapon(FALSE, dummy);
+                               if (dummy) (void)curse_weapon_object(creature_ptr, FALSE, &creature_ptr->inventory_list[dummy]);
                        }
                        if (one_in_(2)) (void)curse_armor(creature_ptr);
                        break;

diff --git a/src/spells-object.c b/src/spells-object.c
index fc2ef31..485de0d 100644 (file)
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -688,19 +688,6 @@ bool curse_weapon_object(player_type *owner_ptr, bool force, object_type *o_ptr)
 
 
 /*!
- * @brief 武器呪縛処理のメインルーチン /
- * Curse the players weapon
- * @param force 無条件に呪縛を行うならばTRUE
- * @param slot 呪縛する武器の装備スロット
- * @return 実際に呪縛されたらTRUEを返す
- */
-bool curse_weapon(bool force, int slot)
-{
-       return curse_weapon_object(p_ptr, force, &p_ptr->inventory_list[slot]);
-}
-
-
-/*!
  * @brief 防具の錆止め防止処理
  * @param caster_ptr 錆止め実行者の参照ポインタ
  * @return ターン消費を要する処理を行ったならばTRUEを返す

diff --git a/src/spells-object.h b/src/spells-object.h
index aca79a9..8a19501 100644 (file)
--- a/src/spells-object.h
+++ b/src/spells-object.h
@@ -7,7 +7,6 @@ extern void acquirement(POSITION y1, POSITION x1, int num, bool great, bool spec
 extern void acquire_chaos_weapon(player_type *creature_ptr);
 extern bool curse_armor(player_type *owner_ptr);
 extern bool curse_weapon_object(player_type *creature_ptr, bool force, object_type *o_ptr);
-extern bool curse_weapon(bool force, int slot);
 extern bool rustproof(player_type *caster_ptr);
 extern void brand_bolts(player_type *caster_ptr);
 extern bool perilous_secrets(player_type *user_ptr);