• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision2ae9b5d2935d712b03aceb32fafa3a23ba812bc9 (tree)
Time2019-02-20 23:04:38
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Fix] #37353 take_turn()の余分なセミコロンを削除。 / Delete duplicated ';' on take_turn().

Change Summary

Incremental Difference

--- a/src/bldg.c
+++ b/src/bldg.c
@@ -4192,7 +4192,7 @@ void do_cmd_quest(void)
41924192 {
41934193 if(p_ptr->wild_mode) return;
41944194
4195- take_turn(p_ptr, 100);;
4195+ take_turn(p_ptr, 100);
41964196
41974197 if (!cave_have_flag_bold(p_ptr->y, p_ptr->x, FF_QUEST_ENTER))
41984198 {
@@ -4234,7 +4234,7 @@ void do_cmd_bldg(void)
42344234
42354235 if(p_ptr->wild_mode) return;
42364236
4237- take_turn(p_ptr, 100);;
4237+ take_turn(p_ptr, 100);
42384238
42394239 if (!cave_have_flag_bold(p_ptr->y, p_ptr->x, FF_BLDG))
42404240 {
--- a/src/cmd-activate.c
+++ b/src/cmd-activate.c
@@ -366,7 +366,7 @@ void do_cmd_activate_aux(INVENTORY_IDX item)
366366 o_ptr = &o_list[0 - item];
367367 }
368368
369- take_turn(p_ptr, 100);;
369+ take_turn(p_ptr, 100);
370370
371371 /* Extract the item level */
372372 lev = k_info[o_ptr->k_idx].level;
--- a/src/cmd-eat.c
+++ b/src/cmd-eat.c
@@ -41,7 +41,7 @@ void do_cmd_eat_food_aux(INVENTORY_IDX item)
4141
4242 sound(SOUND_EAT);
4343
44- take_turn(p_ptr, 100);;
44+ take_turn(p_ptr, 100);
4545
4646 /* Identity not known yet */
4747 ident = FALSE;
--- a/src/cmd-item.c
+++ b/src/cmd-item.c
@@ -342,7 +342,7 @@ void do_cmd_wield(void)
342342 autopick_alter_item(item, FALSE);
343343 }
344344
345- take_turn(p_ptr, 100);;
345+ take_turn(p_ptr, 100);
346346 q_ptr = &forge;
347347
348348 /* Obtain local object */
@@ -728,7 +728,7 @@ void do_cmd_destroy(void)
728728 object_desc(o_name, o_ptr, 0);
729729 o_ptr->number = old_number;
730730
731- take_turn(p_ptr, 100);;
731+ take_turn(p_ptr, 100);
732732
733733 /* Artifacts cannot be destroyed */
734734 if (!can_player_destroy_object(o_ptr))
--- a/src/cmd-magiceat.c
+++ b/src/cmd-magiceat.c
@@ -552,7 +552,7 @@ bool do_cmd_magic_eater(bool only_browse, bool powerful)
552552 sound(SOUND_FAIL);
553553 if (randint1(100) >= chance)
554554 chg_virtue(V_CHANCE,-1);
555- take_turn(p_ptr, 100);;
555+ take_turn(p_ptr, 100);
556556
557557 return TRUE;
558558 }
@@ -580,7 +580,7 @@ bool do_cmd_magic_eater(bool only_browse, bool powerful)
580580 if (randint1(100) < chance)
581581 chg_virtue(V_CHANCE,1);
582582 }
583- take_turn(p_ptr, 100);;
583+ take_turn(p_ptr, 100);
584584 if (tval == TV_ROD) p_ptr->magic_num1[item] += k_info[k_idx].pval * EATER_ROD_CHARGE;
585585 else p_ptr->magic_num1[item] -= EATER_CHARGE;
586586
--- a/src/cmd-pet.c
+++ b/src/cmd-pet.c
@@ -332,7 +332,7 @@ bool do_riding(bool force)
332332
333333 if (g_ptr->m_idx)
334334 {
335- take_turn(p_ptr, 100);;
335+ take_turn(p_ptr, 100);
336336
337337 msg_print(_("モンスターが立ちふさがっている!", "There is a monster in the way!"));
338338
@@ -389,7 +389,7 @@ bool do_riding(bool force)
389389 if (r_info[m_ptr->r_idx].level > randint1((p_ptr->skill_exp[GINOU_RIDING] / 50 + p_ptr->lev / 2 + 20)))
390390 {
391391 msg_print(_("うまく乗れなかった。", "You failed to ride."));
392- take_turn(p_ptr, 100);;
392+ take_turn(p_ptr, 100);
393393 return FALSE;
394394 }
395395
@@ -409,7 +409,7 @@ bool do_riding(bool force)
409409 if (p_ptr->riding == p_ptr->health_who) health_track(0);
410410 }
411411
412- take_turn(p_ptr, 100);;
412+ take_turn(p_ptr, 100);
413413
414414 /* Mega-Hack -- Forget the view and lite */
415415 p_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);
--- a/src/cmd-read.c
+++ b/src/cmd-read.c
@@ -49,7 +49,7 @@ void do_cmd_read_scroll_aux(INVENTORY_IDX item, bool known)
4949 o_ptr = &o_list[0 - item];
5050 }
5151
52- take_turn(p_ptr, 100);;
52+ take_turn(p_ptr, 100);
5353 if (cmd_limit_time_walk(p_ptr)) return;
5454
5555 if (p_ptr->pclass == CLASS_BERSERKER)
--- a/src/cmd-spell.c
+++ b/src/cmd-spell.c
@@ -924,7 +924,7 @@ void do_cmd_study(void)
924924 #endif
925925 }
926926
927- take_turn(p_ptr, 100);;
927+ take_turn(p_ptr, 100);
928928
929929 switch (mp_ptr->spell_book)
930930 {
@@ -1336,7 +1336,7 @@ void do_cmd_cast(void)
13361336 }
13371337 }
13381338
1339- take_turn(p_ptr, 100);;
1339+ take_turn(p_ptr, 100);
13401340
13411341
13421342 /* Over-exert the player */
--- a/src/cmd-usestaff.c
+++ b/src/cmd-usestaff.c
@@ -300,7 +300,7 @@ void do_cmd_use_staff_aux(INVENTORY_IDX item)
300300 }
301301
302302
303- take_turn(p_ptr, 100);;
303+ take_turn(p_ptr, 100);
304304
305305 /* Extract the item level */
306306 lev = k_info[o_ptr->k_idx].level;
--- a/src/cmd-zaprod.c
+++ b/src/cmd-zaprod.c
@@ -298,7 +298,7 @@ void do_cmd_zap_rod_aux(INVENTORY_IDX item)
298298 }
299299
300300
301- take_turn(p_ptr, 100);;
301+ take_turn(p_ptr, 100);
302302
303303 /* Extract the item level */
304304 lev = k_info[o_ptr->k_idx].level;
--- a/src/cmd-zapwand.c
+++ b/src/cmd-zapwand.c
@@ -355,7 +355,7 @@ void do_cmd_aim_wand_aux(INVENTORY_IDX item)
355355 }
356356 target_pet = old_target_pet;
357357
358- take_turn(p_ptr, 100);;
358+ take_turn(p_ptr, 100);
359359
360360 /* Get the level */
361361 lev = k_info[o_ptr->k_idx].level;
--- a/src/cmd2.c
+++ b/src/cmd2.c
@@ -463,7 +463,7 @@ void do_cmd_search(void)
463463 /* Cancel the arg */
464464 command_arg = 0;
465465 }
466- take_turn(p_ptr, 100);;
466+ take_turn(p_ptr, 100);
467467
468468 /* Search */
469469 search();
@@ -521,7 +521,7 @@ static bool do_cmd_open_chest(POSITION y, POSITION x, OBJECT_IDX o_idx)
521521 bool more = FALSE;
522522 object_type *o_ptr = &o_list[o_idx];
523523
524- take_turn(p_ptr, 100);;
524+ take_turn(p_ptr, 100);
525525
526526 /* Attempt to unlock it */
527527 if (o_ptr->pval > 0)
@@ -705,7 +705,7 @@ static bool do_cmd_open_aux(POSITION y, POSITION x)
705705 feature_type *f_ptr = &f_info[g_ptr->feat];
706706 bool more = FALSE;
707707
708- take_turn(p_ptr, 100);;
708+ take_turn(p_ptr, 100);
709709
710710 /* Seeing true feature code (ignore mimic) */
711711
@@ -854,7 +854,7 @@ void do_cmd_open(void)
854854 /* Monster in the way */
855855 else if (g_ptr->m_idx && p_ptr->riding != g_ptr->m_idx)
856856 {
857- take_turn(p_ptr, 100);;
857+ take_turn(p_ptr, 100);
858858 msg_print(_("モンスターが立ちふさがっている!", "There is a monster in the way!"));
859859 py_attack(y, x, 0);
860860 }
@@ -897,7 +897,7 @@ static bool do_cmd_close_aux(POSITION y, POSITION x)
897897 FEAT_IDX old_feat = g_ptr->feat;
898898 bool more = FALSE;
899899
900- take_turn(p_ptr, 100);;
900+ take_turn(p_ptr, 100);
901901
902902 /* Seeing true feature code (ignore mimic) */
903903
@@ -996,7 +996,7 @@ void do_cmd_close(void)
996996 /* Monster in the way */
997997 else if (g_ptr->m_idx)
998998 {
999- take_turn(p_ptr, 100);;
999+ take_turn(p_ptr, 100);
10001000
10011001 msg_print(_("モンスターが立ちふさがっている!", "There is a monster in the way!"));
10021002
@@ -1070,7 +1070,7 @@ static bool do_cmd_tunnel_aux(POSITION y, POSITION x)
10701070 /* Verify legality */
10711071 if (!do_cmd_tunnel_test(y, x)) return (FALSE);
10721072
1073- take_turn(p_ptr, 100);;
1073+ take_turn(p_ptr, 100);
10741074
10751075 g_ptr = &grid_array[y][x];
10761076 f_ptr = &f_info[g_ptr->feat];
@@ -1238,7 +1238,7 @@ void do_cmd_tunnel(void)
12381238 /* A monster is in the way */
12391239 else if (g_ptr->m_idx)
12401240 {
1241- take_turn(p_ptr, 100);;
1241+ take_turn(p_ptr, 100);
12421242
12431243 msg_print(_("モンスターが立ちふさがっている!", "There is a monster in the way!"));
12441244
@@ -1368,7 +1368,7 @@ static bool do_cmd_disarm_chest(POSITION y, POSITION x, OBJECT_IDX o_idx)
13681368 bool more = FALSE;
13691369 object_type *o_ptr = &o_list[o_idx];
13701370
1371- take_turn(p_ptr, 100);;
1371+ take_turn(p_ptr, 100);
13721372
13731373 /* Get the "disarm" factor */
13741374 i = p_ptr->skill_dis;
@@ -1463,7 +1463,7 @@ bool do_cmd_disarm_aux(POSITION y, POSITION x, DIRECTION dir)
14631463 int i = p_ptr->skill_dis;
14641464 int j;
14651465
1466- take_turn(p_ptr, 100);;
1466+ take_turn(p_ptr, 100);
14671467
14681468 /* Penalize some conditions */
14691469 if (p_ptr->blind || no_lite()) i = i / 10;
@@ -1645,7 +1645,7 @@ static bool do_cmd_bash_aux(POSITION y, POSITION x, DIRECTION dir)
16451645
16461646 concptr name = f_name + f_info[get_feat_mimic(g_ptr)].name;
16471647
1648- take_turn(p_ptr, 100);;
1648+ take_turn(p_ptr, 100);
16491649
16501650 msg_format(_("%sに体当たりをした!", "You smash into the %s!"), name);
16511651
@@ -1767,7 +1767,7 @@ void do_cmd_bash(void)
17671767 /* Monster in the way */
17681768 else if (g_ptr->m_idx)
17691769 {
1770- take_turn(p_ptr, 100);;
1770+ take_turn(p_ptr, 100);
17711771
17721772 msg_print(_("モンスターが立ちふさがっている!", "There is a monster in the way!"));
17731773
@@ -1841,7 +1841,7 @@ void do_cmd_alter(void)
18411841 feat = get_feat_mimic(g_ptr);
18421842 f_ptr = &f_info[feat];
18431843
1844- take_turn(p_ptr, 100);;
1844+ take_turn(p_ptr, 100);
18451845
18461846 if (g_ptr->m_idx)
18471847 {
@@ -1977,7 +1977,7 @@ void do_cmd_spike(void)
19771977 /* Is a monster in the way? */
19781978 else if (g_ptr->m_idx)
19791979 {
1980- take_turn(p_ptr, 100);;
1980+ take_turn(p_ptr, 100);
19811981
19821982 msg_print(_("モンスターが立ちふさがっている!", "There is a monster in the way!"));
19831983
@@ -1988,7 +1988,7 @@ void do_cmd_spike(void)
19881988 /* Go for it */
19891989 else
19901990 {
1991- take_turn(p_ptr, 100);;
1991+ take_turn(p_ptr, 100);
19921992
19931993 /* Successful jamming */
19941994 msg_format(_("%sにくさびを打ち込んだ。", "You jam the %s with a spike."), f_name + f_info[feat].name);
@@ -2031,7 +2031,7 @@ void do_cmd_walk(bool pickup)
20312031 /* Get a "repeated" direction */
20322032 if (get_rep_dir(&dir, FALSE))
20332033 {
2034- take_turn(p_ptr, 100);;
2034+ take_turn(p_ptr, 100);
20352035
20362036 if ((dir != 5) && (p_ptr->special_defense & KATA_MUSOU))
20372037 {
@@ -2127,7 +2127,7 @@ void do_cmd_stay(bool pickup)
21272127 command_arg = 0;
21282128 }
21292129
2130- take_turn(p_ptr, 100);;
2130+ take_turn(p_ptr, 100);
21312131
21322132 if (pickup) mpe_mode |= MPE_DO_PICKUP;
21332133 (void)move_player_effect(p_ptr->y, p_ptr->x, mpe_mode);
@@ -2194,7 +2194,7 @@ void do_cmd_rest(void)
21942194 if (p_ptr->special_defense & NINJA_S_STEALTH) set_superstealth(FALSE);
21952195
21962196 /* Take a turn (?) */
2197- take_turn(p_ptr, 100);;
2197+ take_turn(p_ptr, 100);
21982198
21992199 /* The sin of sloth */
22002200 if (command_arg > 100) chg_virtue(V_DILIGENCE, -1);
@@ -2499,7 +2499,7 @@ bool do_cmd_throw(int mult, bool boomerang, OBJECT_IDX shuriken)
24992499 p_ptr->redraw |= (PR_EQUIPPY);
25002500 }
25012501
2502- take_turn(p_ptr, 100);;
2502+ take_turn(p_ptr, 100);
25032503
25042504 /* Rogue and Ninja gets bonus */
25052505 if ((p_ptr->pclass == CLASS_ROGUE) || (p_ptr->pclass == CLASS_NINJA))
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -3661,7 +3661,7 @@ static void process_world(void)
36613661 change_wild_mode();
36623662
36633663 /* Give first move to monsters */
3664- take_turn(p_ptr, 100);;
3664+ take_turn(p_ptr, 100);
36653665
36663666 /* HACk -- set the encouter flag for the wilderness generation */
36673667 generate_encounter = TRUE;
@@ -5000,7 +5000,7 @@ static void process_player(void)
50005000 /* Paralyzed or Knocked Out */
50015001 else if (p_ptr->paralyzed || (p_ptr->stun >= 100))
50025002 {
5003- take_turn(p_ptr, 100);;
5003+ take_turn(p_ptr, 100);
50045004 }
50055005
50065006 /* Resting */
@@ -5016,13 +5016,13 @@ static void process_player(void)
50165016 p_ptr->redraw |= (PR_STATE);
50175017 }
50185018
5019- take_turn(p_ptr, 100);;
5019+ take_turn(p_ptr, 100);
50205020 }
50215021
50225022 /* Fishing */
50235023 else if (p_ptr->action == ACTION_FISH)
50245024 {
5025- take_turn(p_ptr, 100);;
5025+ take_turn(p_ptr, 100);
50265026 }
50275027
50285028 /* Running */
--- a/src/effects.c
+++ b/src/effects.c
@@ -79,7 +79,7 @@ void set_action(ACTION_IDX typ)
7979 case ACTION_HAYAGAKE:
8080 {
8181 msg_print(_("足が重くなった。", "You are no longer walking extremely fast."));
82- take_turn(p_ptr, 100);;
82+ take_turn(p_ptr, 100);
8383 break;
8484 }
8585 case ACTION_SPELL:
--- a/src/hissatsu.c
+++ b/src/hissatsu.c
@@ -351,7 +351,7 @@ void do_cmd_hissatsu(void)
351351 /* Cast the spell */
352352 if (!do_spell(REALM_HISSATSU, n, SPELL_CAST)) return;
353353
354- take_turn(p_ptr, 100);;
354+ take_turn(p_ptr, 100);
355355
356356 /* Use some mana */
357357 p_ptr->csp -= spell.smana;
@@ -439,7 +439,7 @@ void do_cmd_gain_hissatsu(void)
439439 msg_print(_("何も覚えられなかった。", "You were not able to learn any special attacks."));
440440
441441 else
442- take_turn(p_ptr, 100);;
442+ take_turn(p_ptr, 100);
443443
444444 p_ptr->update |= (PU_SPELLS);
445445 }
--- a/src/mane.c
+++ b/src/mane.c
@@ -998,7 +998,7 @@ bool do_cmd_mane(bool baigaesi)
998998 p_ptr->mane_dam[j] = p_ptr->mane_dam[j+1];
999999 }
10001000
1001- take_turn(p_ptr, 100);;
1001+ take_turn(p_ptr, 100);
10021002
10031003 p_ptr->redraw |= (PR_IMITATION);
10041004 p_ptr->window |= (PW_PLAYER);
--- a/src/melee1.c
+++ b/src/melee1.c
@@ -1332,7 +1332,7 @@ bool py_attack(POSITION y, POSITION x, BIT_FLAGS mode)
13321332
13331333 disturb(FALSE, TRUE);
13341334
1335- take_turn(p_ptr, 100);;
1335+ take_turn(p_ptr, 100);
13361336
13371337 if (!p_ptr->migite && !p_ptr->hidarite &&
13381338 !(p_ptr->muta2 & (MUT2_HORNS | MUT2_BEAK | MUT2_SCOR_TAIL | MUT2_TRUNK | MUT2_TENTACLES)))
--- a/src/mind.c
+++ b/src/mind.c
@@ -1615,7 +1615,7 @@ static bool cast_ninja_spell(int spell)
16151615 /* Gives a multiplier of 2 at first, up to 3 at 40th */
16161616 do_cmd_throw(1, FALSE, slot);
16171617
1618- take_turn(p_ptr, 100);;
1618+ take_turn(p_ptr, 100);
16191619 }
16201620 break;
16211621 }
@@ -1982,7 +1982,7 @@ void do_cmd_mind(void)
19821982 }
19831983
19841984
1985- take_turn(p_ptr, 100);;
1985+ take_turn(p_ptr, 100);
19861986 /* teleport from mirror costs small energy */
19871987 if( on_mirror && p_ptr->pclass == CLASS_MIRROR_MASTER )
19881988 {
--- a/src/mspells3.c
+++ b/src/mspells3.c
@@ -1513,7 +1513,7 @@ bool do_cmd_cast_learned(void)
15131513 }
15141514 }
15151515
1516- take_turn(p_ptr, 100);;
1516+ take_turn(p_ptr, 100);
15171517
15181518 p_ptr->redraw |= (PR_MANA);
15191519 p_ptr->window |= (PW_PLAYER | PW_SPELL);
--- a/src/object2.c
+++ b/src/object2.c
@@ -7204,7 +7204,7 @@ static void drain_essence(void)
72047204 if (!get_check(format(_("本当に%sから抽出してよろしいですか?", "Really extract from %s? "), o_name))) return;
72057205 }
72067206
7207- take_turn(p_ptr, 100);;
7207+ take_turn(p_ptr, 100);
72087208
72097209 object_flags(o_ptr, old_flgs);
72107210 if (have_flag(old_flgs, TR_KILL_DRAGON)) add_flag(old_flgs, TR_SLAY_DRAGON);
@@ -7884,7 +7884,7 @@ static void add_essence(ESSENCE_IDX mode)
78847884 if ((o_ptr->to_h >= p_ptr->lev/5+5) && (o_ptr->to_d >= p_ptr->lev/5+5))
78857885 {
78867886 msg_print(_("改良に失敗した。", "You failed to enchant."));
7887- take_turn(p_ptr, 100);;
7887+ take_turn(p_ptr, 100);
78887888 return;
78897889 }
78907890 else
@@ -7898,7 +7898,7 @@ static void add_essence(ESSENCE_IDX mode)
78987898 if (o_ptr->to_a >= p_ptr->lev/5+5)
78997899 {
79007900 msg_print(_("改良に失敗した。", "You failed to enchant."));
7901- take_turn(p_ptr, 100);;
7901+ take_turn(p_ptr, 100);
79027902 return;
79037903 }
79047904 else
@@ -8009,7 +8009,7 @@ static void erase_essence(void)
80098009 object_desc(o_name, o_ptr, (OD_OMIT_PREFIX | OD_NAME_ONLY));
80108010 if (!get_check(format(_("よろしいですか? [%s]", "Are you sure? [%s]"), o_name))) return;
80118011
8012- take_turn(p_ptr, 100);;
8012+ take_turn(p_ptr, 100);
80138013
80148014 if (o_ptr->xtra3 == 1 + ESSENCE_SLAY_GLOVE)
80158015 {
--- a/src/player-move.c
+++ b/src/player-move.c
@@ -1200,7 +1200,7 @@ void move_player(DIRECTION dir, bool do_pickup, bool break_trap)
12001200 }
12011201
12021202 p_ptr->leaving = TRUE;
1203- take_turn(p_ptr, 100);;
1203+ take_turn(p_ptr, 100);
12041204
12051205 return;
12061206 }
@@ -2101,7 +2101,7 @@ void run_step(DIRECTION dir)
21012101 if (--running <= 0) return;
21022102
21032103 /* Take time */
2104- take_turn(p_ptr, 100);;
2104+ take_turn(p_ptr, 100);
21052105
21062106 /* Move the player, using the "pickup" flag */
21072107 move_player(find_current, FALSE, FALSE);
@@ -2238,7 +2238,7 @@ void travel_step(void)
22382238 return;
22392239 }
22402240
2241- take_turn(p_ptr, 100);;
2241+ take_turn(p_ptr, 100);
22422242
22432243 move_player(travel.dir, always_pickup, FALSE);
22442244
--- a/src/racial.c
+++ b/src/racial.c
@@ -349,7 +349,7 @@ static int racial_aux(power_desc_type *pd_ptr)
349349 }
350350
351351 /* take time and pay the price */
352- take_turn(p_ptr, 100);;
352+ take_turn(p_ptr, 100);
353353
354354 /* Success? */
355355 if (randint1(p_ptr->stat_cur[use_stat]) >= ((difficulty / 2) + randint1(difficulty / 2)))
--- a/src/snipe.c
+++ b/src/snipe.c
@@ -506,7 +506,7 @@ static bool cast_sniper_spell(int spell)
506506 {
507507 case 0: /* Concentration */
508508 if (!snipe_concentrate()) return (FALSE);
509- take_turn(p_ptr, 100);;
509+ take_turn(p_ptr, 100);
510510 return (TRUE);
511511 case 1: snipe_type = SP_LITE; break;
512512 case 2: snipe_type = SP_AWAY; break;
--- a/src/spells-object.c
+++ b/src/spells-object.c
@@ -338,7 +338,7 @@ bool import_magic_device(void)
338338 floor_item_describe(0 - item);
339339 floor_item_optimize(0 - item);
340340 }
341- take_turn(p_ptr, 100);;
341+ take_turn(p_ptr, 100);
342342 return TRUE;
343343 }
344344
--- a/src/store.c
+++ b/src/store.c
@@ -5939,7 +5939,7 @@ void do_cmd_store(void)
59395939
59405940 p_ptr->town_num = old_town_num;
59415941
5942- take_turn(p_ptr, 100);;
5942+ take_turn(p_ptr, 100);
59435943
59445944 /* Hack -- Character is no longer in "icky" mode */
59455945 character_icky = FALSE;
Show on old repository browser