• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision68ddc35396267518d96092da65013a9f4901acc9 (tree)
Zeit2019-01-12 18:48:44
AutorDeskull <deskull@user...>
CommiterDeskull

Log Message

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

Ändern Zusammenfassung

Diff

--- 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
285285 MULTIPLY mult = 10;
286286
287287 BIT_FLAGS flgs[TR_FLAG_SIZE];
288-
289- /* Extract the flags */
290288 object_flags(o_ptr, flgs);
291289 torch_flags(o_ptr, flgs); /* torches has secret flags */
292290
--- 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)
22582258 monster_race *r_ptr = &r_info[m_ptr->r_idx];
22592259
22602260 BIT_FLAGS flgs[TR_FLAG_SIZE];
2261-
2262- /* Extract the flags */
22632261 object_flags(o_ptr, flgs);
22642262
22652263 /* Some "weapons" and "ammo" do extra damage */
--- 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,
10101010 {
10111011 char *prev_ptr = ptr;
10121012 BIT_FLAGS flgs[TR_FLAG_SIZE];
1013-
1014- /* Extract the flags */
10151013 object_flags(o_ptr, flgs);
10161014
10171015 /* Remove obvious flags */
--- a/src/init1.c
+++ b/src/init1.c
@@ -3912,7 +3912,6 @@ static void drop_here(object_type *j_ptr, POSITION y, POSITION x)
39123912 cave_type *c_ptr = &cave[y][x];
39133913 object_type *o_ptr;
39143914
3915- /* Get new object */
39163915 OBJECT_IDX o_idx = o_pop();
39173916
39183917 /* Access new object */
@@ -4934,8 +4933,6 @@ void write_r_info_txt(void)
49344933 r_info_blow_effect[b_ptr->effect],
49354934 b_ptr->d_dice, b_ptr->d_side);
49364935 }
4937-
4938- /* Extract the flags */
49394936 for (fc = 0, j = 0; j < 32 * 3; j++)
49404937 {
49414938 /* Check this flag */
--- a/src/load.c
+++ b/src/load.c
@@ -2421,7 +2421,6 @@ static errr rd_inventory(void)
24212421 /* Player touches it */
24222422 q_ptr->marked |= OM_TOUCHED;
24232423
2424- /* Copy object */
24252424 object_copy(&inventory[n], q_ptr);
24262425
24272426 /* Add the weight */
@@ -2449,7 +2448,6 @@ static errr rd_inventory(void)
24492448 /* Player touches it */
24502449 q_ptr->marked |= OM_TOUCHED;
24512450
2452- /* Copy object */
24532451 object_copy(&inventory[n], q_ptr);
24542452
24552453 /* Add the weight */
--- 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
11871187
11881188 msg_format(_("ミス! %sにかわされた。", "You miss %s."), m_name);
11891189 msg_print(_("振り回した大鎌が自分自身に返ってきた!", "Your scythe returns to you!"));
1190-
1191- /* Extract the flags */
11921190 object_flags(o_ptr, flgs_aux);
11931191
11941192 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)
21842182 if (o_idx)
21852183 {
21862184 object_type *j_ptr;
2187-
2188- /* Get new object */
21892185 j_ptr = &o_list[o_idx];
2190-
2191- /* Copy object */
21922186 object_copy(j_ptr, o_ptr);
21932187
21942188 /* Modify number */
--- a/src/object-hook.c
+++ b/src/object-hook.c
@@ -176,8 +176,6 @@ bool item_tester_hook_activate(object_type *o_ptr)
176176
177177 /* Not known */
178178 if (!object_is_known(o_ptr)) return (FALSE);
179-
180- /* Extract the flags */
181179 object_flags(o_ptr, flgs);
182180
183181 /* Check activation flag */
@@ -245,7 +243,6 @@ bool item_tester_hook_use(object_type *o_ptr)
245243 {
246244 if (&inventory[i] == o_ptr)
247245 {
248- /* Extract the flags */
249246 object_flags(o_ptr, flgs);
250247
251248 /* Check activation flag */
--- a/src/object1.c
+++ b/src/object1.c
@@ -474,8 +474,6 @@ static cptr item_activation_aux(object_type *o_ptr)
474474 cptr item_activation(object_type *o_ptr)
475475 {
476476 BIT_FLAGS flgs[TR_FLAG_SIZE];
477-
478- /* Extract the flags */
479477 object_flags(o_ptr, flgs);
480478
481479 /* Require activation ability */
@@ -523,8 +521,6 @@ bool screen_object(object_type *o_ptr, BIT_FLAGS mode)
523521 char desc[256];
524522
525523 int trivial_info = 0;
526-
527- /* Extract the flags */
528524 object_flags(o_ptr, flgs);
529525
530526 /* Extract the description */
--- 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
53165316 }
53175317 }
53185318
5319- /* Get new object */
53205319 if (!done) o_idx = o_pop();
53215320
53225321 /* Failure */
@@ -5328,7 +5327,6 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
53285327 msg_format("The %s disappear%s.", o_name, (plural ? "" : "s"));
53295328 #endif
53305329
5331-
53325330 /* Debug */
53335331 if (p_ptr->wizard) msg_print(_("(アイテムが多過ぎる)", "(too many objects)"));
53345332
@@ -5368,12 +5366,8 @@ OBJECT_IDX drop_near(object_type *j_ptr, PERCENTAGE chance, POSITION y, POSITION
53685366 done = TRUE;
53695367 }
53705368
5371- /* Note the spot */
53725369 note_spot(by, bx);
5373-
5374- /* Draw the spot */
53755370 lite_spot(by, bx);
5376-
53775371 sound(SOUND_DROP);
53785372
53795373 /* Mega-Hack -- no message if "dropped" by player */
--- a/src/player-damage.c
+++ b/src/player-damage.c
@@ -360,8 +360,6 @@ static bool minus_ac(void)
360360 /* No damage left to be done */
361361 if (o_ptr->ac + o_ptr->to_a <= 0) return (FALSE);
362362 object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
363-
364- /* Extract the flags */
365363 object_flags(o_ptr, flgs);
366364
367365 /* Object resists */
--- a/src/selfinfo.c
+++ b/src/selfinfo.c
@@ -84,8 +84,6 @@ void self_knowledge(void)
8484
8585 /* Skip non-objects */
8686 if (!o_ptr->k_idx) continue;
87-
88- /* Extract the flags */
8987 object_flags(o_ptr, tflgs);
9088
9189 /* Extract flags */
--- 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
12931293
12941294 /* Acquire next object */
12951295 next_o_idx = o_ptr->next_o_idx;
1296-
1297- /* Extract the flags */
12981296 object_flags(o_ptr, flgs);
12991297
13001298 /* Check for artifact */
--- a/src/spells3.c
+++ b/src/spells3.c
@@ -2831,8 +2831,6 @@ bool bless_weapon(void)
28312831 if (!o_ptr) return FALSE;
28322832
28332833 object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
2834-
2835- /* Extract the flags */
28362834 object_flags(o_ptr, flgs);
28372835
28382836 if (object_is_cursed(o_ptr))
@@ -2982,8 +2980,6 @@ bool pulish_shield(void)
29822980 if (!o_ptr) return FALSE;
29832981
29842982 object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
2985-
2986- /* Extract the flags */
29872983 object_flags(o_ptr, flgs);
29882984
29892985 if (o_ptr->k_idx && !object_is_artifact(o_ptr) && !object_is_ego(o_ptr) &&
--- 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)
10251025 pi_ptr->pval_desc[0] = '\0';
10261026 return;
10271027 }
1028-
1029- /* Extract the flags */
10301028 object_flags(o_ptr, flgs);
10311029
10321030 affects_list = pi_ptr->pval_affects;
@@ -2069,8 +2067,6 @@ static void spoil_mon_info(cptr fname)
20692067 for (l = 0; l < n; l++)
20702068 {
20712069 monster_race *r_ptr = &r_info[who[l]];
2072-
2073- /* Extract the flags */
20742070 flags1 = r_ptr->flags1;
20752071
20762072 /* Prefix */
--- a/src/wizard2.c
+++ b/src/wizard2.c
@@ -556,8 +556,6 @@ static void wiz_display_item(object_type *o_ptr)
556556 int i, j = 13;
557557 BIT_FLAGS flgs[TR_FLAG_SIZE];
558558 char buf[256];
559-
560- /* Extract the flags */
561559 object_flags(o_ptr, flgs);
562560
563561 /* Clear the screen */
@@ -1264,8 +1262,6 @@ static void do_cmd_wiz_play(void)
12641262 screen_save();
12651263
12661264 q_ptr = &forge;
1267-
1268- /* Copy object */
12691265 object_copy(q_ptr, o_ptr);
12701266
12711267
--- a/src/xtra1.c
+++ b/src/xtra1.c
@@ -2850,8 +2850,6 @@ static void calc_torch(void)
28502850 if((o_ptr->sval == SV_LITE_LANTERN) && !(o_ptr->xtra4 > 0)) continue;
28512851 }
28522852 }
2853-
2854- /* Extract the flags */
28552853 object_flags(o_ptr, flgs);
28562854
28572855 /* calc the lite_radius */
Show on old repository browser