OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

hengband: Commit

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


Commit MetaInfo

Revisionc63d1fc0ae49483b09b0bb9b8058cee6559d074e (tree)
Time2018-11-17 18:06:40
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -85,7 +85,6 @@ void do_cmd_activate_aux(INVENTORY_IDX item)
8585 o_ptr = &o_list[0 - item];
8686 }
8787
88- /* Take a turn */
8988 p_ptr->energy_use = 100;
9089
9190 /* Extract the item level */
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -37,7 +37,6 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
3737
3838 sound(SOUND_EAT);
3939
40- /* Take a turn */
4140 p_ptr->energy_use = 100;
4241
4342 /* Identity not known yet */
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -402,7 +402,6 @@ void do_cmd_wield(void)
402402 autopick_alter_item(item, FALSE);
403403 }
404404
405- /* Take a turn */
406405 p_ptr->energy_use = 100;
407406
408407 /* Get local object */
@@ -898,7 +897,6 @@ void do_cmd_destroy(void)
898897 object_desc(o_name, o_ptr, 0);
899898 o_ptr->number = old_number;
900899
901- /* Take a turn */
902900 p_ptr->energy_use = 100;
903901
904902 /* Artifacts cannot be destroyed */
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -329,7 +329,6 @@ bool do_riding(bool force)
329329
330330 if (c_ptr->m_idx)
331331 {
332- /* Take a turn */
333332 p_ptr->energy_use = 100;
334333
335334 /* Message */
--- a/src/cmd-quaff.c
+++ b/src/cmd-quaff.c
@@ -24,7 +24,6 @@ void do_cmd_quaff_potion_aux(INVENTORY_IDX item)
2424 object_type forge;
2525 object_type *q_ptr;
2626
27- p_ptr->energy_use = 100; /* Take a turn */
2827
2928 if (world_player)
3029 {
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -41,7 +41,6 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
4141 }
4242
4343
44- /* Take a turn */
4544 p_ptr->energy_use = 100;
4645
4746 if (world_player)
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -340,7 +340,6 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
340340 }
341341
342342
343- /* Take a turn */
344343 p_ptr->energy_use = 100;
345344
346345 /* Extract the item level */
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -295,7 +295,6 @@ void do_cmd_zap_rod_aux(INVENTORY_IDX item)
295295 }
296296
297297
298- /* Take a turn */
299298 p_ptr->energy_use = 100;
300299
301300 /* Extract the item level */
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -350,7 +350,6 @@ void do_cmd_aim_wand_aux(INVENTORY_IDX item)
350350 }
351351 target_pet = old_target_pet;
352352
353- /* Take a turn */
354353 p_ptr->energy_use = 100;
355354
356355 /* Get the level */
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -384,8 +384,6 @@ void do_cmd_search(void)
384384 /* Cancel the arg */
385385 command_arg = 0;
386386 }
387-
388- /* Take a turn */
389387 p_ptr->energy_use = 100;
390388
391389 /* Search */
@@ -447,15 +445,10 @@ static OBJECT_IDX chest_check(POSITION y, POSITION x, bool trapped)
447445 static bool do_cmd_open_chest(POSITION y, POSITION x, OBJECT_IDX o_idx)
448446 {
449447 int i, j;
450-
451448 bool flag = TRUE;
452-
453449 bool more = FALSE;
454-
455450 object_type *o_ptr = &o_list[o_idx];
456451
457-
458- /* Take a turn */
459452 p_ptr->energy_use = 100;
460453
461454 /* Attempt to unlock it */
@@ -675,13 +668,9 @@ static bool do_cmd_open_aux(POSITION y, POSITION x)
675668
676669 /* Get requested grid */
677670 cave_type *c_ptr = &cave[y][x];
678-
679671 feature_type *f_ptr = &f_info[c_ptr->feat];
680-
681672 bool more = FALSE;
682673
683-
684- /* Take a turn */
685674 p_ptr->energy_use = 100;
686675
687676 /* Seeing true feature code (ignore mimic) */
@@ -840,7 +829,6 @@ void do_cmd_open(void)
840829 /* Monster in the way */
841830 else if (c_ptr->m_idx && p_ptr->riding != c_ptr->m_idx)
842831 {
843- /* Take a turn */
844832 p_ptr->energy_use = 100;
845833
846834 /* Message */
@@ -889,7 +877,6 @@ static bool do_cmd_close_aux(POSITION y, POSITION x)
889877 FEAT_IDX old_feat = c_ptr->feat;
890878 bool more = FALSE;
891879
892- /* Take a turn */
893880 p_ptr->energy_use = 100;
894881
895882 /* Seeing true feature code (ignore mimic) */
@@ -1001,7 +988,6 @@ void do_cmd_close(void)
1001988 /* Monster in the way */
1002989 else if (c_ptr->m_idx)
1003990 {
1004- /* Take a turn */
1005991 p_ptr->energy_use = 100;
1006992
1007993 /* Message */
@@ -1082,7 +1068,6 @@ static bool do_cmd_tunnel_aux(POSITION y, POSITION x)
10821068 /* Verify legality */
10831069 if (!do_cmd_tunnel_test(y, x)) return (FALSE);
10841070
1085- /* Take a turn */
10861071 p_ptr->energy_use = 100;
10871072
10881073 /* Get grid */
@@ -1260,7 +1245,6 @@ void do_cmd_tunnel(void)
12601245 /* A monster is in the way */
12611246 else if (c_ptr->m_idx)
12621247 {
1263- /* Take a turn */
12641248 p_ptr->energy_use = 100;
12651249
12661250 /* Message */
@@ -1400,13 +1384,9 @@ bool easy_open_door(POSITION y, POSITION x)
14001384 static bool do_cmd_disarm_chest(POSITION y, POSITION x, OBJECT_IDX o_idx)
14011385 {
14021386 int i, j;
1403-
14041387 bool more = FALSE;
1405-
14061388 object_type *o_ptr = &o_list[o_idx];
14071389
1408-
1409- /* Take a turn */
14101390 p_ptr->energy_use = 100;
14111391
14121392 /* Get the "disarm" factor */
@@ -1506,15 +1486,12 @@ static bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir)
15061486
15071487 /* Extract trap "power" */
15081488 int power = f_ptr->power;
1509-
15101489 bool more = FALSE;
15111490
15121491 /* Get the "disarm" factor */
15131492 int i = p_ptr->skill_dis;
1514-
15151493 int j;
15161494
1517- /* Take a turn */
15181495 p_ptr->energy_use = 100;
15191496
15201497 /* Penalize some conditions */
@@ -1732,7 +1709,6 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir)
17321709
17331710 cptr name = f_name + f_info[get_feat_mimic(c_ptr)].name;
17341711
1735- /* Take a turn */
17361712 p_ptr->energy_use = 100;
17371713
17381714 /* Message */
@@ -1866,7 +1842,6 @@ void do_cmd_bash(void)
18661842 /* Monster in the way */
18671843 else if (c_ptr->m_idx)
18681844 {
1869- /* Take a turn */
18701845 p_ptr->energy_use = 100;
18711846
18721847 /* Message */
@@ -1948,7 +1923,6 @@ void do_cmd_alter(void)
19481923 feat = get_feat_mimic(c_ptr);
19491924 f_ptr = &f_info[feat];
19501925
1951- /* Take a turn */
19521926 p_ptr->energy_use = 100;
19531927
19541928 /* Attack monsters */
@@ -2093,7 +2067,6 @@ void do_cmd_spike(void)
20932067 /* Is a monster in the way? */
20942068 else if (c_ptr->m_idx)
20952069 {
2096- /* Take a turn */
20972070 p_ptr->energy_use = 100;
20982071
20992072 /* Message */
@@ -2106,7 +2079,6 @@ void do_cmd_spike(void)
21062079 /* Go for it */
21072080 else
21082081 {
2109- /* Take a turn */
21102082 p_ptr->energy_use = 100;
21112083
21122084 /* Successful jamming */
@@ -2152,7 +2124,6 @@ void do_cmd_walk(bool pickup)
21522124 /* Get a "repeated" direction */
21532125 if (get_rep_dir(&dir, FALSE))
21542126 {
2155- /* Take a turn */
21562127 p_ptr->energy_use = 100;
21572128
21582129 if ((dir != 5) && (p_ptr->special_defense & KATA_MUSOU))
@@ -2257,7 +2228,6 @@ void do_cmd_stay(bool pickup)
22572228 command_arg = 0;
22582229 }
22592230
2260- /* Take a turn */
22612231 p_ptr->energy_use = 100;
22622232
22632233 if (pickup) mpe_mode |= MPE_DO_PICKUP;
@@ -3677,7 +3647,6 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
36773647 p_ptr->redraw |= (PR_EQUIPPY);
36783648 }
36793649
3680- /* Take a turn */
36813650 p_ptr->energy_use = 100;
36823651
36833652 /* Rogue and Ninja gets bonus */
--- a/src/cmd5.c
+++ b/src/cmd5.c
@@ -878,7 +878,6 @@ void do_cmd_study(void)
878878 #endif
879879 }
880880
881- /* Take a turn */
882881 p_ptr->energy_use = 100;
883882
884883 switch (mp_ptr->spell_book)
@@ -1318,7 +1317,6 @@ void do_cmd_cast(void)
13181317 }
13191318 }
13201319
1321- /* Take a turn */
13221320 p_ptr->energy_use = 100;
13231321
13241322
--- a/src/defines.h
+++ b/src/defines.h
@@ -719,12 +719,13 @@
719719 /*
720720 * Indexes of the various "stats" (hard-coded by savefiles, etc).
721721 */
722-#define A_STR 0
723-#define A_INT 1
724-#define A_WIS 2
725-#define A_DEX 3
726-#define A_CON 4
727-#define A_CHR 5
722+#define A_STR 0
723+#define A_INT 1
724+#define A_WIS 2
725+#define A_DEX 3
726+#define A_CON 4
727+#define A_CHR 5
728+#define A_MAX 6
728729
729730 /*
730731 * Player sex constants (hard-coded by save-files, arrays, etc)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1466,7 +1466,6 @@ static void process_world_aux_hp_and_sp(void)
14661466 take_hit(DAMAGE_NOESCAPE, dam, _("致命傷", "a fatal wound"), -1);
14671467 }
14681468
1469-
14701469 /* (Vampires) Take damage from sunlight */
14711470 if (prace_is_(RACE_VAMPIRE) || (p_ptr->mimic_form == MIMIC_VAMPIRE))
14721471 {
@@ -1477,7 +1476,6 @@ static void process_world_aux_hp_and_sp(void)
14771476 /* Take damage */
14781477 msg_print(_("日光があなたのアンデッドの肉体を焼き焦がした！", "The sun's rays scorch your undead flesh!"));
14791478 take_hit(DAMAGE_NOESCAPE, 1, _("日光", "sunlight"), -1);
1480-
14811479 cave_no_regen = TRUE;
14821480 }
14831481 }
@@ -1518,11 +1516,10 @@ static void process_world_aux_hp_and_sp(void)
15181516
15191517 if (damage)
15201518 {
1521- if (prace_is_(RACE_ENT)) damage += damage / 3;
1522- if (p_ptr->resist_fire) damage = damage / 3;
1523- if (IS_OPPOSE_FIRE()) damage = damage / 3;
1524-
1525- if (p_ptr->levitation) damage = damage / 5;
1519+ if(prace_is_(RACE_ENT)) damage += damage / 3;
1520+ if(p_ptr->resist_fire) damage = damage / 3;
1521+ if(IS_OPPOSE_FIRE()) damage = damage / 3;
1522+ if(p_ptr->levitation) damage = damage / 5;
15261523
15271524 damage = damage / 100 + (randint0(100) < (damage % 100));
15281525
@@ -1595,11 +1592,9 @@ static void process_world_aux_hp_and_sp(void)
15951592 */
15961593 if (!have_flag(f_ptr->flags, FF_MOVE) && !have_flag(f_ptr->flags, FF_CAN_FLY))
15971594 {
1598- if (!IS_INVULN() && !p_ptr->wraith_form && !p_ptr->kabenuke &&
1599- ((p_ptr->chp > (p_ptr->lev / 5)) || !p_ptr->pass_wall))
1595+ if (!IS_INVULN() && !p_ptr->wraith_form && !p_ptr->kabenuke && ((p_ptr->chp > (p_ptr->lev / 5)) || !p_ptr->pass_wall))
16001596 {
16011597 cptr dam_desc;
1602-
16031598 cave_no_regen = TRUE;
16041599
16051600 if (p_ptr->pass_wall)
@@ -2077,13 +2072,11 @@ static void process_world_aux_mutation(void)
20772072 /* No effect on the global map */
20782073 if (p_ptr->wild_mode) return;
20792074
2080-
20812075 if ((p_ptr->muta2 & MUT2_BERS_RAGE) && one_in_(3000))
20822076 {
20832077 disturb(0, 1);
20842078 msg_print(_("ウガァァア！", "RAAAAGHH!"));
20852079 msg_print(_("激怒の発作に襲われた！", "You feel a fit of rage coming over you!"));
2086-
20872080 (void)set_shero(10 + randint1(p_ptr->lev), FALSE);
20882081 (void)set_afraid(0);
20892082 }
@@ -2100,12 +2093,9 @@ static void process_world_aux_mutation(void)
21002093
21012094 if ((p_ptr->muta2 & MUT2_RTELEPORT) && (randint1(5000) == 88))
21022095 {
2103- if (!p_ptr->resist_nexus && !(p_ptr->muta1 & MUT1_VTELEPORT) &&
2104- !p_ptr->anti_tele)
2096+ if (!p_ptr->resist_nexus && !(p_ptr->muta1 & MUT1_VTELEPORT) && !p_ptr->anti_tele)
21052097 {
21062098 disturb(0, 1);
2107-
2108- /* Teleport player */
21092099 msg_print(_("あなたの位置は突然ひじょうに不確定になった...", "Your position suddenly seems very uncertain..."));
21102100 msg_print(NULL);
21112101 teleport_player(40, TELEPORT_PASSIVE);
@@ -2162,9 +2152,7 @@ static void process_world_aux_mutation(void)
21622152 if ((p_ptr->muta2 & MUT2_FLATULENT) && (randint1(3000) == 13))
21632153 {
21642154 disturb(0, 1);
2165-
21662155 msg_print(_("ブゥーーッ！おっと。", "BRRAAAP! Oops."));
2167-
21682156 msg_print(NULL);
21692157 fire_ball(GF_POIS, 0, p_ptr->lev, 3);
21702158 }
@@ -2183,8 +2171,7 @@ static void process_world_aux_mutation(void)
21832171 fire_ball(GF_MANA, dire, p_ptr->lev * 2, 3);
21842172 }
21852173
2186- if ((p_ptr->muta2 & MUT2_ATT_DEMON) &&
2187- !p_ptr->anti_magic && (randint1(6666) == 666))
2174+ if ((p_ptr->muta2 & MUT2_ATT_DEMON) && !p_ptr->anti_magic && (randint1(6666) == 666))
21882175 {
21892176 bool pet = one_in_(6);
21902177 BIT_FLAGS mode = PM_ALLOW_GROUP;
@@ -2192,8 +2179,7 @@ static void process_world_aux_mutation(void)
21922179 if (pet) mode |= PM_FORCE_PET;
21932180 else mode |= (PM_ALLOW_UNIQUE | PM_NO_PET);
21942181
2195- if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x,
2196- dun_level, SUMMON_DEMON, mode))
2182+ if (summon_specific((pet ? -1 : 0), p_ptr->y, p_ptr->x, dun_level, SUMMON_DEMON, mode))
21972183 {
21982184 msg_print(_("あなたはデーモンを引き寄せた！", "You have attracted a demon!"));
21992185 disturb(0, 1);
@@ -2336,7 +2322,7 @@ static void process_world_aux_mutation(void)
23362322 }
23372323 if ((p_ptr->muta2 & MUT2_WASTING) && one_in_(3000))
23382324 {
2339- int which_stat = randint0(6);
2325+ int which_stat = randint0(A_MAX);
23402326 int sustained = FALSE;
23412327
23422328 switch (which_stat)
@@ -2592,12 +2578,11 @@ static void process_world_aux_curse(void)
25922578 (void)activate_ty_curse(FALSE, &count);
25932579 }
25942580 /* Handle experience draining */
2595- if (p_ptr->prace != RACE_ANDROID &&
2596- ((p_ptr->cursed & TRC_DRAIN_EXP) && one_in_(4)))
2581+ if (p_ptr->prace != RACE_ANDROID && ((p_ptr->cursed & TRC_DRAIN_EXP) && one_in_(4)))
25972582 {
2598- p_ptr->exp -= (p_ptr->lev+1)/2;
2583+ p_ptr->exp -= (p_ptr->lev + 1) / 2;
25992584 if (p_ptr->exp < 0) p_ptr->exp = 0;
2600- p_ptr->max_exp -= (p_ptr->lev+1)/2;
2585+ p_ptr->max_exp -= (p_ptr->lev + 1) / 2;
26012586 if (p_ptr->max_exp < 0) p_ptr->max_exp = 0;
26022587 check_experience();
26032588 }
@@ -4843,9 +4828,9 @@ static void process_player(void)
48434828 msg_print(NULL);
48444829 if (r_idx && one_in_(2))
48454830 {
4846- int y, x;
4847- y = p_ptr->y+ddy[tsuri_dir];
4848- x = p_ptr->x+ddx[tsuri_dir];
4831+ POSITION y, x;
4832+ y = p_ptr->y + ddy[tsuri_dir];
4833+ x = p_ptr->x + ddx[tsuri_dir];
48494834 if (place_monster_aux(0, y, x, r_idx, PM_NO_KAGE))
48504835 {
48514836 char m_name[80];
@@ -4874,8 +4859,7 @@ static void process_player(void)
48744859 /* Check for a key */
48754860 if (inkey())
48764861 {
4877- /* Flush input */
4878- flush();
4862+ flush(); /* Flush input */
48794863
48804864 /* Disturb */
48814865 disturb(0, 1);
@@ -4938,7 +4922,7 @@ static void process_player(void)
49384922 if (MON_MONFEAR(m_ptr))
49394923 {
49404924 /* Hack -- Recover from fear */
4941- if (set_monster_monfear(p_ptr->riding,
4925+ if(set_monster_monfear(p_ptr->riding,
49424926 (randint0(r_ptr->level) < p_ptr->skill_exp[GINOU_RIDING]) ? 0 : (MON_MONFEAR(m_ptr) - 1)))
49434927 {
49444928 char m_name[80];
@@ -4964,10 +4948,7 @@ static void process_player(void)
49644948 }
49654949 if ((p_ptr->pclass == CLASS_FORCETRAINER) && P_PTR_KI)
49664950 {
4967- if (P_PTR_KI < 40)
4968- {
4969- P_PTR_KI = 0;
4970- }
4951+ if(P_PTR_KI < 40) P_PTR_KI = 0;
49714952 else P_PTR_KI -= 40;
49724953 p_ptr->update |= (PU_BONUS);
49734954 }
@@ -4978,7 +4959,6 @@ static void process_player(void)
49784959
49794960 /* Convert the unit (1/2^16) to (1/2^32) */
49804961 s64b_LSHIFT(cost, cost_frac, 16);
4981-
49824962
49834963 if (s64b_cmp(p_ptr->csp, p_ptr->csp_frac, cost, cost_frac) < 0)
49844964 {
@@ -5033,19 +5013,15 @@ static void process_player(void)
50335013 /* Refresh (optional) */
50345014 if (fresh_before) Term_fresh();
50355015
5036-
50375016 /* Hack -- Pack Overflow */
50385017 pack_overflow();
50395018
5040-
50415019 /* Hack -- cancel "lurking browse mode" */
50425020 if (!command_new) command_see = FALSE;
50435021
5044-
50455022 /* Assume free turn */
50465023 p_ptr->energy_use = 0;
50475024
5048-
50495025 if (p_ptr->inside_battle)
50505026 {
50515027 /* Place the cursor on the player */
@@ -5060,7 +5036,6 @@ static void process_player(void)
50605036 /* Paralyzed or Knocked Out */
50615037 else if (p_ptr->paralyzed || (p_ptr->stun >= 100))
50625038 {
5063- /* Take a turn */
50645039 p_ptr->energy_use = 100;
50655040 }
50665041
@@ -5079,14 +5054,12 @@ static void process_player(void)
50795054 p_ptr->redraw |= (PR_STATE);
50805055 }
50815056
5082- /* Take a turn */
50835057 p_ptr->energy_use = 100;
50845058 }
50855059
50865060 /* Fishing */
50875061 else if (p_ptr->action == ACTION_FISH)
50885062 {
5089- /* Take a turn */
50905063 p_ptr->energy_use = 100;
50915064 }
50925065
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -372,7 +372,6 @@ void do_cmd_hissatsu(void)
372372 /* Cast the spell */
373373 if (!do_spell(REALM_HISSATSU, n, SPELL_CAST)) return;
374374
375- /* Take a turn */
376375 p_ptr->energy_use = 100;
377376
378377 /* Use some mana */
@@ -479,7 +478,6 @@ void do_cmd_gain_hissatsu(void)
479478 if (!gain)
480479 msg_print(_("何も覚えられなかった。", "You were not able to learn any special attacks."));
481480
482- /* Take a turn */
483481 else
484482 p_ptr->energy_use = 100;
485483
--- a/src/mane.c
+++ b/src/mane.c
@@ -1040,7 +1040,6 @@ bool do_cmd_mane(bool baigaesi)
10401040 p_ptr->mane_dam[j] = p_ptr->mane_dam[j+1];
10411041 }
10421042
1043- /* Take a turn */
10441043 p_ptr->energy_use = 100;
10451044
10461045 /* Window stuff */
--- a/src/mind.c
+++ b/src/mind.c
@@ -2096,7 +2096,6 @@ void do_cmd_mind(void)
20962096 }
20972097
20982098
2099- /* Take a turn */
21002099 p_ptr->energy_use = 100;
21012100 /* teleport from mirror costs small energy */
21022101 if( on_mirror && p_ptr->pclass == CLASS_MIRROR_MASTER )
--- a/src/monster-process.c
+++ b/src/monster-process.c
@@ -2742,7 +2742,6 @@ void process_monster(MONSTER_IDX m_idx)
27422742 /* Do not bash the door */
27432743 may_bash = FALSE;
27442744
2745- /* Take a turn */
27462745 do_turn = TRUE;
27472746 }
27482747
@@ -2758,7 +2757,6 @@ void process_monster(MONSTER_IDX m_idx)
27582757 /* Do not bash the door */
27592758 may_bash = FALSE;
27602759
2761- /* Take a turn */
27622760 do_turn = TRUE;
27632761 }
27642762 }
@@ -3026,7 +3024,6 @@ void process_monster(MONSTER_IDX m_idx)
30263024 /* Note changes to viewable region */
30273025 do_view = TRUE;
30283026
3029- /* Take a turn */
30303027 do_turn = TRUE;
30313028 }
30323029
@@ -3064,7 +3061,6 @@ void process_monster(MONSTER_IDX m_idx)
30643061 /* Creature has been allowed move */
30653062 if (do_move)
30663063 {
3067- /* Take a turn */
30683064 do_turn = TRUE;
30693065
30703066 if (have_flag(f_ptr->flags, FF_TREE))
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -1590,7 +1590,6 @@ bool do_cmd_cast_learned(void)
15901590 }
15911591 }
15921592
1593- /* Take a turn */
15941593 p_ptr->energy_use = 100;
15951594
15961595 /* Window stuff */
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -602,7 +602,6 @@ void do_cmd_snipe(void)
602602
603603 if (!cast) return;
604604 #if 0
605- /* Take a turn */
606605 p_ptr->energy_use = 100;
607606 #endif
608607 /* Redraw mana */
Show on old repository browser