[Refactor] #37353 player-item.c/hにref_item()を追加。

Add ref_item() to player-item.c/h.

diff --git a/src/player-item.c b/src/player-item.c
new file mode 100644 (file)
index 0000000..3376902
--- /dev/null
+++ b/src/player-item.c
@@ -0,0 +1,8 @@
+#include "angband.h"
+#include "player-item.h"
+
+object_type *ref_item(player_type *player_ptr, INVENTORY_IDX idx)
+{
+       (player_ptr); // しばらくは未使用
+       return idx >= 0 ? &inventory[idx] : &o_list[0 - idx];
+}
\ No newline at end of file

diff --git a/src/player-item.h b/src/player-item.h
new file mode 100644 (file)
index 0000000..2b6470f
--- /dev/null
+++ b/src/player-item.h
@@ -0,0 +1,2 @@
+
+extern object_type *ref_item(player_type *player_ptr, INVENTORY_IDX idx);

diff --git a/src/spells3.c b/src/spells3.c
index c01a550..6c01044 100644 (file)
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -4112,27 +4112,21 @@ bool rustproof(void)
        if ((o_ptr->to_a < 0) && !object_is_cursed(o_ptr))
        {
 #ifdef JP
-msg_format("%sは新品同様になった！",o_name);
+               msg_format("%sは新品同様になった！",o_name);
 #else
-               msg_format("%s %s look%s as good as new!",
-                       ((item >= 0) ? "Your" : "The"), o_name,
-                       ((o_ptr->number > 1) ? "" : "s"));
+               msg_format("%s %s look%s as good as new!", ((item >= 0) ? "Your" : "The"), o_name, ((o_ptr->number > 1) ? "" : "s"));
 #endif
 
                o_ptr->to_a = 0;
        }
 
 #ifdef JP
-msg_format("%sは腐食しなくなった。", o_name);
+       msg_format("%sは腐食しなくなった。", o_name);
 #else
-       msg_format("%s %s %s now protected against corrosion.",
-               ((item >= 0) ? "Your" : "The"), o_name,
-               ((o_ptr->number > 1) ? "are" : "is"));
+       msg_format("%s %s %s now protected against corrosion.", ((item >= 0) ? "Your" : "The"), o_name, ((o_ptr->number > 1) ? "are" : "is"));
 #endif
 
-
        calc_android_exp();
-
        return TRUE;
 }