From 68ddc35396267518d96092da65013a9f4901acc9 Mon Sep 17 00:00:00 2001 From: Deskull Date: Sat, 12 Jan 2019 18:16:02 +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/cmd1.c | 2 -- src/cmd2.c | 2 -- src/flavor.c | 2 -- src/init1.c | 3 --- src/load.c | 2 -- src/melee1.c | 6 ------ src/object-hook.c | 3 --- src/object1.c | 4 ---- src/object2.c | 6 ------ src/player-damage.c | 2 -- src/selfinfo.c | 2 -- src/spells1.c | 2 -- src/spells3.c | 4 ---- src/wizard1.c | 4 ---- src/wizard2.c | 4 ---- src/xtra1.c | 2 -- 16 files changed, 50 deletions(-) diff --git a/src/cmd1.c b/src/cmd1.c index cd3036942..5ad507714 100644 --- a/src/cmd1.c +++ b/src/cmd1.c @@ -285,8 +285,6 @@ HIT_POINT tot_dam_aux(object_type *o_ptr, HIT_POINT tdam, monster_type *m_ptr, B MULTIPLY mult = 10; BIT_FLAGS flgs[TR_FLAG_SIZE]; - - /* Extract the flags */ object_flags(o_ptr, flgs); torch_flags(o_ptr, flgs); /* torches has secret flags */ diff --git a/src/cmd2.c b/src/cmd2.c index d906d5b83..6e59e9537 100644 --- a/src/cmd2.c +++ b/src/cmd2.c @@ -2258,8 +2258,6 @@ static s16b tot_dam_aux_shot(object_type *o_ptr, int tdam, monster_type *m_ptr) monster_race *r_ptr = &r_info[m_ptr->r_idx]; BIT_FLAGS flgs[TR_FLAG_SIZE]; - - /* Extract the flags */ object_flags(o_ptr, flgs); /* Some "weapons" and "ammo" do extra damage */ diff --git a/src/flavor.c b/src/flavor.c index efabbc442..90c22188a 100644 --- a/src/flavor.c +++ b/src/flavor.c @@ -1010,8 +1010,6 @@ static char *get_ability_abbreviation(char *ptr, object_type *o_ptr, bool kanji, { char *prev_ptr = ptr; BIT_FLAGS flgs[TR_FLAG_SIZE]; - - /* Extract the flags */ object_flags(o_ptr, flgs); /* Remove obvious flags */ diff --git a/src/init1.c b/src/init1.c index 98720fb68..672f163b8 100644 --- a/src/init1.c +++ b/src/init1.c @@ -3912,7 +3912,6 @@ static void drop_here(object_type *j_ptr, POSITION y, POSITION x) cave_type *c_ptr = &cave[y][x]; object_type *o_ptr; - /* Get new object */ OBJECT_IDX o_idx = o_pop(); /* Access new object */ @@ -4934,8 +4933,6 @@ void write_r_info_txt(void) r_info_blow_effect[b_ptr->effect], b_ptr->d_dice, b_ptr->d_side); } - - /* Extract the flags */ for (fc = 0, j = 0; j < 32 * 3; j++) { /* Check this flag */ diff --git a/src/load.c b/src/load.c index 12db4de3e..8f0357597 100644 --- a/src/load.c +++ b/src/load.c @@ -2421,7 +2421,6 @@ static errr rd_inventory(void) /* Player touches it */ q_ptr->marked |= OM_TOUCHED; - /* Copy object */ object_copy(&inventory[n], q_ptr); /* Add the weight */ @@ -2449,7 +2448,6 @@ static errr rd_inventory(void) /* Player touches it */ q_ptr->marked |= OM_TOUCHED; - /* Copy object */ object_copy(&inventory[n], q_ptr); /* Add the weight */ diff --git a/src/melee1.c b/src/melee1.c index 163e3de09..f7be80544 100644 --- a/src/melee1.c +++ b/src/melee1.c @@ -1187,8 +1187,6 @@ static void py_attack_aux(POSITION y, POSITION x, bool *fear, bool *mdeath, s16b msg_format(_("ミス！ %sにかわされた。", "You miss %s."), m_name); msg_print(_("振り回した大鎌が自分自身に返ってきた！", "Your scythe returns to you!")); - - /* Extract the flags */ object_flags(o_ptr, flgs_aux); k = damroll(o_ptr->dd + p_ptr->to_dd[hand], o_ptr->ds + p_ptr->to_ds[hand]); @@ -2184,11 +2182,7 @@ bool make_attack_normal(MONSTER_IDX m_idx) if (o_idx) { object_type *j_ptr; - - /* Get new object */ j_ptr = &o_list[o_idx]; - - /* Copy object */ object_copy(j_ptr, o_ptr); /* Modify number */ diff --git a/src/object-hook.c b/src/object-hook.c index 31ee7eb9b..8f1147003 100644 --- a/src/object-hook.c +++ b/src/object-hook.c @@ -176,8 +176,6 @@ bool item_tester_hook_activate(object_type *o_ptr) /* Not known */ if (!object_is_known(o_ptr)) return (FALSE); - - /* Extract the flags */ object_flags(o_ptr, flgs); /* Check activation flag */ @@ -245,7 +243,6 @@ bool item_tester_hook_use(object_type *o_ptr) { if (&inventory[i] == o_ptr) { - /* Extract the flags */ object_flags(o_ptr, flgs); /* Check activation flag */ diff --git a/src/object1.c b/src/object1.c index b5a4c073f..dad05dd4d 100644 --- a/src/object1.c +++ b/src/object1.c @@ -474,8 +474,6 @@ static cptr item_activation_aux(object_type *o_ptr) cptr item_activation(object_type *o_ptr) { BIT_FLAGS flgs[TR_FLAG_SIZE]; - - /* Extract the flags */ object_flags(o_ptr, flgs); /* Require activation ability */ @@ -523,8 +521,6 @@ bool screen_object(object_type *o_ptr, BIT_FLAGS mode) char desc[256]; int trivial_info = 0; - - /* Extract the flags */ object_flags(o_ptr, flgs); /* Extract the description */ diff --git a/src/object2.c b/src/object2.c index 87ab6ed06..22e430f39 100644 --- a/src/object2.c +++ b/src/object2.c @@ -5316,7 +5316,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION } } - /* Get new object */ if (!done) o_idx = o_pop(); /* Failure */ @@ -5328,7 +5327,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION msg_format("The %s disappear%s.", o_name, (plural ? "" : "s")); #endif - /* Debug */ if (p_ptr->wizard) msg_print(_("(アイテムが多過ぎる)", "(too many objects)")); @@ -5368,12 +5366,8 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION done = TRUE; } - /* Note the spot */ note_spot(by, bx); - - /* Draw the spot */ lite_spot(by, bx); - sound(SOUND_DROP); /* Mega-Hack -- no message if "dropped" by player */ diff --git a/src/player-damage.c b/src/player-damage.c index 20306facb..dafdad065 100644 --- a/src/player-damage.c +++ b/src/player-damage.c @@ -360,8 +360,6 @@ static bool minus_ac(void) /* No damage left to be done */ if (o_ptr->ac + o_ptr->to_a <= 0) return (FALSE); object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); - - /* Extract the flags */ object_flags(o_ptr, flgs); /* Object resists */ diff --git a/src/selfinfo.c b/src/selfinfo.c index 43d24c31d..b5a12e175 100644 --- a/src/selfinfo.c +++ b/src/selfinfo.c @@ -84,8 +84,6 @@ void self_knowledge(void) /* Skip non-objects */ if (!o_ptr->k_idx) continue; - - /* Extract the flags */ object_flags(o_ptr, tflgs); /* Extract flags */ diff --git a/src/spells1.c b/src/spells1.c index 3a5e7fe55..ed348e015 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -1293,8 +1293,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; - - /* Extract the flags */ object_flags(o_ptr, flgs); /* Check for artifact */ diff --git a/src/spells3.c b/src/spells3.c index 450cf071c..31f5b2893 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -2831,8 +2831,6 @@ bool bless_weapon(void) if (!o_ptr) return FALSE; object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); - - /* Extract the flags */ object_flags(o_ptr, flgs); if (object_is_cursed(o_ptr)) @@ -2982,8 +2980,6 @@ bool pulish_shield(void) if (!o_ptr) return FALSE; object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY)); - - /* Extract the flags */ object_flags(o_ptr, flgs); if (o_ptr->k_idx && !object_is_artifact(o_ptr) && !object_is_ego(o_ptr) && diff --git a/src/wizard1.c b/src/wizard1.c index 36394febb..d58ad2f0a 100644 --- a/src/wizard1.c +++ b/src/wizard1.c @@ -1025,8 +1025,6 @@ static void analyze_pval(object_type *o_ptr, pval_info_type *pi_ptr) pi_ptr->pval_desc[0] = '\0'; return; } - - /* Extract the flags */ object_flags(o_ptr, flgs); affects_list = pi_ptr->pval_affects; @@ -2069,8 +2067,6 @@ static void spoil_mon_info(cptr fname) for (l = 0; l < n; l++) { monster_race *r_ptr = &r_info[who[l]]; - - /* Extract the flags */ flags1 = r_ptr->flags1; /* Prefix */ diff --git a/src/wizard2.c b/src/wizard2.c index 885f658b8..63bf2b01b 100644 --- a/src/wizard2.c +++ b/src/wizard2.c @@ -556,8 +556,6 @@ static void wiz_display_item(object_type *o_ptr) int i, j = 13; BIT_FLAGS flgs[TR_FLAG_SIZE]; char buf[256]; - - /* Extract the flags */ object_flags(o_ptr, flgs); /* Clear the screen */ @@ -1264,8 +1262,6 @@ static void do_cmd_wiz_play(void) screen_save(); q_ptr = &forge; - - /* Copy object */ object_copy(q_ptr, o_ptr); diff --git a/src/xtra1.c b/src/xtra1.c index 242b1f33a..c41e0ef44 100644 --- a/src/xtra1.c +++ b/src/xtra1.c @@ -2850,8 +2850,6 @@ static void calc_torch(void) if((o_ptr->sval == SV_LITE_LANTERN) && !(o_ptr->xtra4 > 0)) continue; } } - - /* Extract the flags */ object_flags(o_ptr, flgs); /* calc the lite_radius */ -- 2.11.0