[feature] ソースファイルをC++に対応

[hengbandforosx/hengbandosx.git] / src / cmd-item / cmd-refill.c

diff --git a/src/cmd-item/cmd-refill.c b/src/cmd-item/cmd-refill.c
index 276bda8..68a4af1 100644 (file)
--- a/src/cmd-item/cmd-refill.c
+++ b/src/cmd-item/cmd-refill.c
@@ -30,7 +30,7 @@ static void do_cmd_refill_lamp(player_type *user_ptr)
     item_tester_hook = item_tester_refill_lantern;
     concptr q = _("どの油つぼから注ぎますか? ", "Refill with which flask? ");
     concptr s = _("油つぼがない。", "You have no flasks of oil.");
-    o_ptr = choose_object(user_ptr, &item, q, s, USE_INVEN | USE_FLOOR, 0);
+    o_ptr = choose_object(user_ptr, &item, q, s, USE_INVEN | USE_FLOOR, TV_NONE);
     if (!o_ptr)
         return;
 
@@ -42,7 +42,7 @@ static void do_cmd_refill_lamp(player_type *user_ptr)
     object_flags(user_ptr, j_ptr, flgs2);
     j_ptr->xtra4 += o_ptr->xtra4;
     msg_print(_("ランプに油を注いだ。", "You fuel your lamp."));
-    if ((o_ptr->name2 == EGO_LITE_DARKNESS) && (j_ptr->xtra4 > 0)) {
+    if (has_flag(flgs, TR_DARK_SOURCE) && (j_ptr->xtra4 > 0)) {
         j_ptr->xtra4 = 0;
         msg_print(_("ランプが消えてしまった！", "Your lamp has gone out!"));
     } else if (has_flag(flgs, TR_DARK_SOURCE) || has_flag(flgs2, TR_DARK_SOURCE)) {
@@ -70,7 +70,7 @@ static void do_cmd_refill_torch(player_type *user_ptr)
     item_tester_hook = object_can_refill_torch;
     concptr q = _("どの松明で明かりを強めますか? ", "Refuel with which torch? ");
     concptr s = _("他に松明がない。", "You have no extra torches.");
-    o_ptr = choose_object(user_ptr, &item, q, s, USE_INVEN | USE_FLOOR, 0);
+    o_ptr = choose_object(user_ptr, &item, q, s, USE_INVEN | USE_FLOOR, TV_NONE);
     if (!o_ptr)
         return;