From aabb8b610ae79d124594272e37302c5cd7acdf87 Mon Sep 17 00:00:00 2001 From: deskull Date: Mon, 4 Mar 2019 22:33:29 +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/autopick.c | 4 +--- src/cmd4.c | 2 -- src/floor-streams.c | 2 -- src/grid.c | 6 ------ src/monster-process.c | 2 -- src/monster2.c | 6 ------ src/mspells1.c | 2 -- src/object1.c | 7 ------- src/object2.c | 10 ---------- src/player-move.c | 7 ------- src/player-status.c | 2 -- src/spells1.c | 2 -- src/spells2.c | 2 -- src/spells3.c | 3 --- src/xtra2.c | 6 ------ 15 files changed, 1 insertion(+), 62 deletions(-) diff --git a/src/autopick.c b/src/autopick.c index 8235c8d03..3ad5cea14 100644 --- a/src/autopick.c +++ b/src/autopick.c @@ -1710,9 +1710,7 @@ void autopick_pickup_items(grid_type *g_ptr) { int idx; object_type *o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ - next_o_idx = o_ptr->next_o_idx; + next_o_idx = o_ptr->next_o_idx; idx = is_autopick(o_ptr); diff --git a/src/cmd4.c b/src/cmd4.c index 061cf49ad..aac03f1f7 100644 --- a/src/cmd4.c +++ b/src/cmd4.c @@ -5283,8 +5283,6 @@ static void do_cmd_knowledge_artifacts(void) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Ignore non-artifacts */ diff --git a/src/floor-streams.c b/src/floor-streams.c index a53a0456a..696f2c917 100644 --- a/src/floor-streams.c +++ b/src/floor-streams.c @@ -295,8 +295,6 @@ void build_streamer(IDX feat, int chance) for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx) { object_type *o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Hack -- Preserve unknown artifacts */ diff --git a/src/grid.c b/src/grid.c index e462d5ea7..f17cd8751 100644 --- a/src/grid.c +++ b/src/grid.c @@ -1376,8 +1376,6 @@ bool cave_valid_bold(POSITION y, POSITION x) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Forbid artifact grids */ @@ -1943,8 +1941,6 @@ void map_info(POSITION y, POSITION x, TERM_COLOR *ap, SYMBOL_CODE *cp, TERM_COLO { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Memorized objects */ @@ -2231,8 +2227,6 @@ void note_spot(POSITION y, POSITION x) for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx) { object_type *o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Memorize objects */ diff --git a/src/monster-process.c b/src/monster-process.c index 9dc4703c6..0248a689b 100644 --- a/src/monster-process.c +++ b/src/monster-process.c @@ -3075,8 +3075,6 @@ void process_monster(MONSTER_IDX m_idx) BIT_FLAGS flgs[TR_FLAG_SIZE], flg2 = 0L, flg3 = 0L, flgr = 0L; GAME_TEXT m_name[MAX_NLEN], o_name[MAX_NLEN]; object_type *o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; if (do_take) diff --git a/src/monster2.c b/src/monster2.c index 6851eff18..302b44a5b 100644 --- a/src/monster2.c +++ b/src/monster2.c @@ -274,8 +274,6 @@ void delete_monster_idx(MONSTER_IDX i) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* @@ -360,8 +358,6 @@ static void compact_monsters_aux(IDX i1, IDX i2) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Reset monster pointer */ @@ -4479,8 +4475,6 @@ void monster_drop_carried_objects(monster_type *m_ptr) for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx) { o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; q_ptr = &forge; diff --git a/src/mspells1.c b/src/mspells1.c index ce3abeafb..3dc4222e7 100644 --- a/src/mspells1.c +++ b/src/mspells1.c @@ -420,8 +420,6 @@ bool raise_possible(monster_type *m_ptr) for (this_o_idx = g_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx) { object_type *o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Known to be worthless? */ diff --git a/src/object1.c b/src/object1.c index 0a22c872f..e7699021b 100644 --- a/src/object1.c +++ b/src/object1.c @@ -2844,8 +2844,6 @@ bool get_item(OBJECT_IDX *cp, concptr pmt, concptr str, BIT_FLAGS mode) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Accept the item on the floor if legal */ @@ -3194,8 +3192,6 @@ bool get_item(OBJECT_IDX *cp, concptr pmt, concptr str, BIT_FLAGS mode) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Validate the item */ @@ -3488,8 +3484,6 @@ ITEM_NUMBER scan_floor(OBJECT_IDX *items, POSITION y, POSITION x, BIT_FLAGS mode { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Item tester */ @@ -4854,7 +4848,6 @@ void py_pickup_floor(bool pickup) /* Access the next object */ next_o_idx = o_ptr->next_o_idx; - /* Hack -- disturb */ disturb(FALSE, FALSE); /* Pick up gold */ diff --git a/src/object2.c b/src/object2.c index 0b4802569..b7efef6bf 100644 --- a/src/object2.c +++ b/src/object2.c @@ -86,8 +86,6 @@ void excise_object_idx(OBJECT_IDX o_idx) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; if (this_o_idx == o_idx) @@ -137,8 +135,6 @@ void excise_object_idx(OBJECT_IDX o_idx) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; if (this_o_idx == o_idx) @@ -232,8 +228,6 @@ void delete_object(POSITION y, POSITION x) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; object_wipe(o_ptr); @@ -5006,8 +5000,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Check for possible combination */ @@ -5157,8 +5149,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Check for combination */ diff --git a/src/player-move.c b/src/player-move.c index 7110aa050..b68766a9e 100644 --- a/src/player-move.c +++ b/src/player-move.c @@ -193,8 +193,6 @@ static void discover_hidden_things(POSITION y, POSITION x) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Skip non-chests */ @@ -389,11 +387,8 @@ void carry(bool pickup) #endif /* ALLOW_EASY_SENSE -- TNB */ object_desc(o_name, o_ptr, 0); - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; - /* Hack -- disturb */ disturb(FALSE, FALSE); /* Pick up gold */ @@ -1603,8 +1598,6 @@ static bool run_test(void) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Visible object */ diff --git a/src/player-status.c b/src/player-status.c index 9973414c7..277fae2e5 100644 --- a/src/player-status.c +++ b/src/player-status.c @@ -2647,8 +2647,6 @@ void calc_bonuses(void) for (this_o_idx = current_floor_ptr->grid_array[p_ptr->y][p_ptr->x].o_idx; this_o_idx; this_o_idx = next_o_idx) { o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; #if 0 diff --git a/src/spells1.c b/src/spells1.c index 704869bc5..ed830acff 100644 --- a/src/spells1.c +++ b/src/spells1.c @@ -652,8 +652,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P /* Get the "plural"-ness */ bool plural = (o_ptr->number > 1); #endif - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; object_flags(o_ptr, flgs); diff --git a/src/spells2.c b/src/spells2.c index 90eccf004..77abb1a5d 100644 --- a/src/spells2.c +++ b/src/spells2.c @@ -1491,8 +1491,6 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Hack -- Preserve unknown artifacts */ diff --git a/src/spells3.c b/src/spells3.c index 867f56765..de9ea92f6 100644 --- a/src/spells3.c +++ b/src/spells3.c @@ -3977,8 +3977,6 @@ bool polymorph_monster(POSITION y, POSITION x) for (this_o_idx = back_m.hold_o_idx; this_o_idx; this_o_idx = next_o_idx) { object_type *o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Held by new monster */ @@ -3989,7 +3987,6 @@ bool polymorph_monster(POSITION y, POSITION x) { for (this_o_idx = back_m.hold_o_idx; this_o_idx; this_o_idx = next_o_idx) { - /* Acquire next object */ next_o_idx = current_floor_ptr->o_list[this_o_idx].next_o_idx; delete_object_idx(this_o_idx); } diff --git a/src/xtra2.c b/src/xtra2.c index bd801089d..153effdeb 100644 --- a/src/xtra2.c +++ b/src/xtra2.c @@ -758,8 +758,6 @@ static bool target_set_accept(POSITION y, POSITION x) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Memorized object */ @@ -1114,8 +1112,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, concptr info) object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; /* Obtain an object description */ @@ -1262,8 +1258,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, concptr info) { object_type *o_ptr; o_ptr = ¤t_floor_ptr->o_list[this_o_idx]; - - /* Acquire next object */ next_o_idx = o_ptr->next_o_idx; if (o_ptr->marked & OM_FOUND) -- 2.11.0