From 0b431aad830fc6f9ab898a522081d9e022894c39 Mon Sep 17 00:00:00 2001 From: Deskull Date: Sat, 29 Dec 2018 18:44:41 +0900 Subject: [PATCH] =?utf8?q?[Refactor]=20#37353=20=E3=82=B3=E3=83=A1?= =?utf8?q?=E3=83=B3=E3=83=88=E6=95=B4=E7=90=86=E3=80=82=20/=20Refactor=20c?= =?utf8?q?omments.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- src/cmd-eat.c | 2 -- src/init1.c | 2 -- src/object2.c | 2 -- src/wizard2.c | 12 +----------- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/src/cmd-eat.c b/src/cmd-eat.c index f1653fb7f..4358cc6f5 100644 --- a/src/cmd-eat.c +++ b/src/cmd-eat.c @@ -440,8 +440,6 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item) object_type *q_ptr = &forge; msg_print(_("食べ物がアゴを素通りして落ちた!", "The food falls through your jaws!")); - - /* Create the item */ object_prep(q_ptr, lookup_kind(o_ptr->tval, o_ptr->sval)); /* Drop the object from heaven */ diff --git a/src/init1.c b/src/init1.c index 4f3f15022..98d98e14c 100644 --- a/src/init1.c +++ b/src/init1.c @@ -4112,8 +4112,6 @@ static errr process_dungeon_file_aux(char *buf, int ymin, int xmin, int ymax, in else if (object_index) { object_type *o_ptr = &object_type_body; - - /* Create the item */ object_prep(o_ptr, object_index); if (o_ptr->tval == TV_GOLD) diff --git a/src/object2.c b/src/object2.c index a45f57fd2..868da753b 100644 --- a/src/object2.c +++ b/src/object2.c @@ -4433,8 +4433,6 @@ void apply_magic(object_type *o_ptr, DEPTH lev, BIT_FLAGS mode) return; } - - /* Apply magic */ switch (o_ptr->tval) { case TV_DIGGING: diff --git a/src/wizard2.c b/src/wizard2.c index 2f459c871..aaddbfcbe 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -1413,11 +1413,8 @@ static void wiz_create_item(void) } } q_ptr = &forge; - - /* Create the item */ object_prep(q_ptr, k_idx); - /* Apply magic */ apply_magic(q_ptr, dun_level, AM_NO_FIXED_ART); /* Drop the object from heaven */ @@ -1485,8 +1482,6 @@ static void do_cmd_wiz_jump(void) /* Paranoia */ if (command_arg < d_info[dungeon_type].mindepth) command_arg = 0; - - /* Paranoia */ if (command_arg > d_info[dungeon_type].maxdepth) command_arg = (COMMAND_ARG)d_info[dungeon_type].maxdepth; /* Accept request */ @@ -1531,7 +1526,7 @@ static void do_cmd_wiz_jump(void) */ static void do_cmd_wiz_learn(void) { - IDX i; + KIND_OBJECT_IDX i; object_type forge; object_type *q_ptr; @@ -1545,11 +1540,7 @@ static void do_cmd_wiz_learn(void) if (k_ptr->level <= command_arg) { q_ptr = &forge; - - /* Prepare object */ object_prep(q_ptr, i); - - /* Awareness */ object_aware(q_ptr); } } @@ -1611,7 +1602,6 @@ static void do_cmd_wiz_zap(void) { MONSTER_IDX i; - /* Genocide everyone nearby */ for (i = 1; i < m_max; i++) { -- 2.11.0