• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision64e26c838ef374d593cee35b413e07081dcb941d (tree)
Time2018-12-04 20:12:28
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Refactor] #37353 コメント整理 / Refactor comments.

Change Summary

Incremental Difference

--- a/src/autopick.c
+++ b/src/autopick.c
@@ -1706,9 +1706,7 @@ void autopick_pickup_items(cave_type *c_ptr)
17061706 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
17071707 {
17081708 int idx;
1709-
1710- /* Acquire object */
1711- object_type *o_ptr = &o_list[this_o_idx];
1709+ object_type *o_ptr = &o_list[this_o_idx];
17121710
17131711 /* Acquire next object */
17141712 next_o_idx = o_ptr->next_o_idx;
--- a/src/cave.c
+++ b/src/cave.c
@@ -626,8 +626,6 @@ bool cave_valid_bold(POSITION y, POSITION x)
626626 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
627627 {
628628 object_type *o_ptr;
629-
630- /* Acquire object */
631629 o_ptr = &o_list[this_o_idx];
632630
633631 /* Acquire next object */
@@ -1195,8 +1193,6 @@ void map_info(POSITION y, POSITION x, TERM_COLOR *ap, char *cp, TERM_COLOR *tap,
11951193 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
11961194 {
11971195 object_type *o_ptr;
1198-
1199- /* Acquire object */
12001196 o_ptr = &o_list[this_o_idx];
12011197
12021198 /* Acquire next object */
--- a/src/cmd1.c
+++ b/src/cmd1.c
@@ -386,8 +386,6 @@ static void discover_hidden_things(POSITION y, POSITION x)
386386 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
387387 {
388388 object_type *o_ptr;
389-
390- /* Acquire object */
391389 o_ptr = &o_list[this_o_idx];
392390
393391 /* Acquire next object */
@@ -575,8 +573,6 @@ void carry(bool pickup)
575573 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
576574 {
577575 object_type *o_ptr;
578-
579- /* Acquire object */
580576 o_ptr = &o_list[this_o_idx];
581577
582578 #ifdef ALLOW_EASY_SENSE /* TNB */
@@ -1815,8 +1811,6 @@ static bool run_test(void)
18151811 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
18161812 {
18171813 object_type *o_ptr;
1818-
1819- /* Acquire object */
18201814 o_ptr = &o_list[this_o_idx];
18211815
18221816 /* Acquire next object */
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -5403,8 +5403,6 @@ static void do_cmd_knowledge_artifacts(void)
54035403 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
54045404 {
54055405 object_type *o_ptr;
5406-
5407- /* Acquire object */
54085406 o_ptr = &o_list[this_o_idx];
54095407
54105408 /* Acquire next object */
--- a/src/floor-streams.c
+++ b/src/floor-streams.c
@@ -293,7 +293,6 @@ void build_streamer(IDX feat, int chance)
293293 /* Scan all objects in the grid */
294294 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
295295 {
296- /* Acquire object */
297296 object_type *o_ptr = &o_list[this_o_idx];
298297
299298 /* Acquire next object */
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -3099,8 +3099,6 @@ void process_monster(MONSTER_IDX m_idx)
30993099 {
31003100 BIT_FLAGS flgs[TR_FLAG_SIZE], flg2 = 0L, flg3 = 0L, flgr = 0L;
31013101 char m_name[80], o_name[MAX_NLEN];
3102-
3103- /* Acquire object */
31043102 object_type *o_ptr = &o_list[this_o_idx];
31053103
31063104 /* Acquire next object */
--- a/src/monster2.c
+++ b/src/monster2.c
@@ -266,8 +266,6 @@ void delete_monster_idx(MONSTER_IDX i)
266266 for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
267267 {
268268 object_type *o_ptr;
269-
270- /* Acquire object */
271269 o_ptr = &o_list[this_o_idx];
272270
273271 /* Acquire next object */
@@ -354,8 +352,6 @@ static void compact_monsters_aux(IDX i1, IDX i2)
354352 for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
355353 {
356354 object_type *o_ptr;
357-
358- /* Acquire object */
359355 o_ptr = &o_list[this_o_idx];
360356
361357 /* Acquire next object */
@@ -4557,7 +4553,6 @@ void monster_drop_carried_objects(monster_type *m_ptr)
45574553 /* Drop objects being carried */
45584554 for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
45594555 {
4560- /* Acquire object */
45614556 o_ptr = &o_list[this_o_idx];
45624557
45634558 /* Acquire next object */
--- a/src/mspells1.c
+++ b/src/mspells1.c
@@ -415,7 +415,6 @@ bool raise_possible(monster_type *m_ptr)
415415 /* Scan the pile of objects */
416416 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
417417 {
418- /* Acquire object */
419418 object_type *o_ptr = &o_list[this_o_idx];
420419
421420 /* Acquire next object */
--- a/src/object1.c
+++ b/src/object1.c
@@ -2766,8 +2766,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode)
27662766
27672767 /* Special index */
27682768 k = 0 - (*cp);
2769-
2770- /* Acquire object */
27712769 o_ptr = &o_list[k];
27722770
27732771 /* Validate the item */
@@ -2886,8 +2884,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode)
28862884 for (this_o_idx = cave[p_ptr->y][p_ptr->x].o_idx; this_o_idx; this_o_idx = next_o_idx)
28872885 {
28882886 object_type *o_ptr;
2889-
2890- /* Acquire object */
28912887 o_ptr = &o_list[this_o_idx];
28922888
28932889 /* Acquire next object */
@@ -3253,8 +3249,6 @@ bool get_item(OBJECT_IDX *cp, cptr pmt, cptr str, BIT_FLAGS mode)
32533249 for (this_o_idx = cave[p_ptr->y][p_ptr->x].o_idx; this_o_idx; this_o_idx = next_o_idx)
32543250 {
32553251 object_type *o_ptr;
3256-
3257- /* Acquire object */
32583252 o_ptr = &o_list[this_o_idx];
32593253
32603254 /* Acquire next object */
@@ -3535,8 +3529,6 @@ ITEM_NUMBER scan_floor(OBJECT_IDX *items, POSITION y, POSITION x, BIT_FLAGS mode
35353529 for (this_o_idx = cave[y][x].o_idx; this_o_idx; this_o_idx = next_o_idx)
35363530 {
35373531 object_type *o_ptr;
3538-
3539- /* Acquire object */
35403532 o_ptr = &o_list[this_o_idx];
35413533
35423534 /* Acquire next object */
--- a/src/object2.c
+++ b/src/object2.c
@@ -81,8 +81,6 @@ void excise_object_idx(OBJECT_IDX o_idx)
8181 for (this_o_idx = m_ptr->hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
8282 {
8383 object_type *o_ptr;
84-
85- /* Acquire object */
8684 o_ptr = &o_list[this_o_idx];
8785
8886 /* Acquire next object */
@@ -135,8 +133,6 @@ void excise_object_idx(OBJECT_IDX o_idx)
135133 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
136134 {
137135 object_type *o_ptr;
138-
139- /* Acquire object */
140136 o_ptr = &o_list[this_o_idx];
141137
142138 /* Acquire next object */
@@ -233,8 +229,6 @@ void delete_object(POSITION y, POSITION x)
233229 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
234230 {
235231 object_type *o_ptr;
236-
237- /* Acquire object */
238232 o_ptr = &o_list[this_o_idx];
239233
240234 /* Acquire next object */
@@ -272,7 +266,6 @@ static void compact_objects_aux(OBJECT_IDX i1, OBJECT_IDX i2)
272266 /* Repair objects */
273267 for (i = 1; i < o_max; i++)
274268 {
275- /* Acquire object */
276269 o_ptr = &o_list[i];
277270
278271 /* Skip "dead" objects */
@@ -285,8 +278,6 @@ static void compact_objects_aux(OBJECT_IDX i1, OBJECT_IDX i2)
285278 o_ptr->next_o_idx = i2;
286279 }
287280 }
288-
289- /* Acquire object */
290281 o_ptr = &o_list[i1];
291282
292283 /* Monster */
@@ -554,8 +545,6 @@ OBJECT_IDX o_pop(void)
554545 for (i = 1; i < o_max; i++)
555546 {
556547 object_type *o_ptr;
557-
558- /* Acquire object */
559548 o_ptr = &o_list[i];
560549
561550 /* Skip live objects */
@@ -4919,8 +4908,6 @@ void place_object(POSITION y, POSITION x, BIT_FLAGS mode)
49194908 if (o_idx)
49204909 {
49214910 object_type *o_ptr;
4922-
4923- /* Acquire object */
49244911 o_ptr = &o_list[o_idx];
49254912
49264913 /* Structure Copy */
@@ -5036,8 +5023,6 @@ void place_gold(POSITION y, POSITION x)
50365023 if (o_idx)
50375024 {
50385025 object_type *o_ptr;
5039-
5040- /* Acquire object */
50415026 o_ptr = &o_list[o_idx];
50425027
50435028 /* Copy the object */
@@ -5172,8 +5157,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
51725157 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
51735158 {
51745159 object_type *o_ptr;
5175-
5176- /* Acquire object */
51775160 o_ptr = &o_list[this_o_idx];
51785161
51795162 /* Acquire next object */
@@ -5326,8 +5309,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
53265309 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
53275310 {
53285311 object_type *o_ptr;
5329-
5330- /* Acquire object */
53315312 o_ptr = &o_list[this_o_idx];
53325313
53335314 /* Acquire next object */
--- a/src/spells1.c
+++ b/src/spells1.c
@@ -1284,7 +1284,6 @@ static bool project_o(MONSTER_IDX who, POSITION r, POSITION y, POSITION x, HIT_P
12841284 /* Scan all objects in the grid */
12851285 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
12861286 {
1287- /* Acquire object */
12881287 object_type *o_ptr = &o_list[this_o_idx];
12891288
12901289 bool is_art = FALSE;
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -964,8 +964,7 @@ void aggravate_monsters(MONSTER_IDX who)
964964 /* Aggravate everyone nearby */
965965 for (i = 1; i < m_max; i++)
966966 {
967- monster_type *m_ptr = &m_list[i];
968-/* monster_race *r_ptr = &r_info[m_ptr->r_idx]; */
967+ monster_type *m_ptr = &m_list[i];
969968
970969 /* Paranoia -- Skip dead monsters */
971970 if (!m_ptr->r_idx) continue;
@@ -1477,8 +1476,6 @@ bool destroy_area(POSITION y1, POSITION x1, POSITION r, bool in_generate)
14771476 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
14781477 {
14791478 object_type *o_ptr;
1480-
1481- /* Acquire object */
14821479 o_ptr = &o_list[this_o_idx];
14831480
14841481 /* Acquire next object */
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -4426,7 +4426,6 @@ bool polymorph_monster(POSITION y, POSITION x)
44264426 {
44274427 for (this_o_idx = back_m.hold_o_idx; this_o_idx; this_o_idx = next_o_idx)
44284428 {
4429- /* Acquire object */
44304429 object_type *o_ptr = &o_list[this_o_idx];
44314430
44324431 /* Acquire next object */
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -5724,7 +5724,6 @@ void calc_bonuses(void)
57245724
57255725 for (this_o_idx = cave[p_ptr->y][p_ptr->x].o_idx; this_o_idx; this_o_idx = next_o_idx)
57265726 {
5727- /* Acquire object */
57285727 o_ptr = &o_list[this_o_idx];
57295728
57305729 /* Acquire next object */
--- a/src/xtra2.c
+++ b/src/xtra2.c
@@ -2719,8 +2719,6 @@ static bool target_set_accept(POSITION y, POSITION x)
27192719 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
27202720 {
27212721 object_type *o_ptr;
2722-
2723- /* Acquire object */
27242722 o_ptr = &o_list[this_o_idx];
27252723
27262724 /* Acquire next object */
@@ -3089,8 +3087,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
30893087 char o_name[MAX_NLEN];
30903088
30913089 object_type *o_ptr;
3092-
3093- /* Acquire object */
30943090 o_ptr = &o_list[this_o_idx];
30953091
30963092 /* Acquire next object */
@@ -3139,8 +3135,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
31393135 char o_name[MAX_NLEN];
31403136
31413137 object_type *o_ptr;
3142-
3143- /* Acquire object */
31443138 o_ptr = &o_list[floor_list[0]];
31453139
31463140 object_desc(o_name, o_ptr, 0);
@@ -3241,8 +3235,6 @@ static char target_set_aux(POSITION y, POSITION x, BIT_FLAGS mode, cptr info)
32413235 for (this_o_idx = c_ptr->o_idx; this_o_idx; this_o_idx = next_o_idx)
32423236 {
32433237 object_type *o_ptr;
3244-
3245- /* Acquire object */
32463238 o_ptr = &o_list[this_o_idx];
32473239
32483240 /* Acquire next object */
Show on old repository browser