[Refactor] #963 Renamed take_turn() to update_player_turn_energy()

diff --git a/src/action/activation-execution.cpp b/src/action/activation-execution.cpp
index a3551c5..0046493 100644 (file)
--- a/src/action/activation-execution.cpp
+++ b/src/action/activation-execution.cpp
@@ -224,7 +224,7 @@ static bool activate_whistle(player_type *user_ptr, ae_type *ae_ptr)
  */
 void exe_activate(player_type *user_ptr, INVENTORY_IDX item)
 {
-    take_turn(user_ptr, 100);
+    update_player_turn_energy(user_ptr, 100);
     ae_type tmp_ae;
     ae_type *ae_ptr = initialize_ae_type(user_ptr, &tmp_ae, item);
     decide_activation_level(user_ptr, ae_ptr);

diff --git a/src/action/movement-execution.cpp b/src/action/movement-execution.cpp
index 444f2ef..7300995 100644 (file)
--- a/src/action/movement-execution.cpp
+++ b/src/action/movement-execution.cpp
@@ -136,7 +136,7 @@ void exe_movement(player_type *creature_ptr, DIRECTION dir, bool do_pickup, bool
             }
 
             creature_ptr->leaving = TRUE;
-            take_turn(creature_ptr, 100);
+            update_player_turn_energy(creature_ptr, 100);
             return;
         }
 

diff --git a/src/action/open-close-execution.cpp b/src/action/open-close-execution.cpp
index ceb563c..fde7f1d 100644 (file)
--- a/src/action/open-close-execution.cpp
+++ b/src/action/open-close-execution.cpp
@@ -39,7 +39,7 @@ bool exe_open(player_type *creature_ptr, POSITION y, POSITION x)
 {
     grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x];
     feature_type *f_ptr = &f_info[g_ptr->feat];
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (!has_flag(f_ptr->flags, FF_OPEN)) {
         msg_format(_("%sはがっちりと閉じられているようだ。", "The %s appears to be stuck."), f_info[get_feat_mimic(g_ptr)].name.c_str());
         return FALSE;
@@ -95,7 +95,7 @@ bool exe_close(player_type *creature_ptr, POSITION y, POSITION x)
     grid_type *g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x];
     FEAT_IDX old_feat = g_ptr->feat;
     bool more = FALSE;
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (!has_flag(f_info[old_feat].flags, FF_CLOSE))
         return more;
 
@@ -188,7 +188,7 @@ bool exe_disarm_chest(player_type *creature_ptr, POSITION y, POSITION x, OBJECT_
 {
     bool more = FALSE;
     object_type *o_ptr = &creature_ptr->current_floor_ptr->o_list[o_idx];
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     int i = creature_ptr->skill_dis;
     if (creature_ptr->blind || no_lite(creature_ptr))
         i = i / 10;
@@ -248,7 +248,7 @@ bool exe_disarm(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir
     int power = f_ptr->power;
     bool more = FALSE;
     int i = creature_ptr->skill_dis;
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (creature_ptr->blind || no_lite(creature_ptr))
         i = i / 10;
 
@@ -300,7 +300,7 @@ bool exe_bash(player_type *creature_ptr, POSITION y, POSITION x, DIRECTION dir)
     int temp = f_ptr->power;
     bool more = FALSE;
     concptr name = f_info[get_feat_mimic(g_ptr)].name.c_str();
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     msg_format(_("%sに体当たりをした！", "You smash into the %s!"), name);
     temp = (bash - (temp * 10));
     if (creature_ptr->pclass == CLASS_BERSERKER)

diff --git a/src/action/racial-execution.cpp b/src/action/racial-execution.cpp
index 65d5482..f2a80dd 100644 (file)
--- a/src/action/racial-execution.cpp
+++ b/src/action/racial-execution.cpp
@@ -123,7 +123,7 @@ racial_level_check_result check_racial_level(player_type *creature_ptr, rpi_type
     }
 
     adjust_racial_power_difficulty(creature_ptr, rpi_ptr, &difficulty);
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (randint1(creature_ptr->stat_cur[use_stat]) >= ((difficulty / 2) + randint1(difficulty / 2)))
         return RACIAL_SUCCESS;
 

diff --git a/src/action/run-execution.cpp b/src/action/run-execution.cpp
index 3fd5343..4103f06 100644 (file)
--- a/src/action/run-execution.cpp
+++ b/src/action/run-execution.cpp
@@ -382,7 +382,7 @@ void run_step(player_type *creature_ptr, DIRECTION dir)
     if (--creature_ptr->running <= 0)
         return;
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     exe_movement(creature_ptr, find_current, FALSE, FALSE);
     if (player_bold(creature_ptr, creature_ptr->run_py, creature_ptr->run_px)) {
         creature_ptr->run_py = 0;

diff --git a/src/action/travel-execution.cpp b/src/action/travel-execution.cpp
index 9f70a5c..e049c49 100644 (file)
--- a/src/action/travel-execution.cpp
+++ b/src/action/travel-execution.cpp
@@ -104,7 +104,7 @@ void travel_step(player_type *creature_ptr)
         return;
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     exe_movement(creature_ptr, travel.dir, always_pickup, FALSE);
     if ((creature_ptr->y == travel.y) && (creature_ptr->x == travel.x)) {
         travel.run = 0;

diff --git a/src/action/tunnel-execution.cpp b/src/action/tunnel-execution.cpp
index 30b7573..4ccaae0 100644 (file)
--- a/src/action/tunnel-execution.cpp
+++ b/src/action/tunnel-execution.cpp
@@ -62,7 +62,7 @@ bool exe_tunnel(player_type *creature_ptr, POSITION y, POSITION x)
     if (!do_cmd_tunnel_test(creature_ptr->current_floor_ptr, y, x))
         return FALSE;
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     g_ptr = &creature_ptr->current_floor_ptr->grid_array[y][x];
     f_ptr = &f_info[g_ptr->feat];
     power = f_ptr->power;

diff --git a/src/cmd-action/cmd-attack.cpp b/src/cmd-action/cmd-attack.cpp
index 55cd9e0..60afd2b 100644 (file)
--- a/src/cmd-action/cmd-attack.cpp
+++ b/src/cmd-action/cmd-attack.cpp
@@ -177,7 +177,7 @@ bool do_cmd_attack(player_type *attacker_ptr, POSITION y, POSITION x, combat_opt
 
     disturb(attacker_ptr, FALSE, TRUE);
 
-    take_turn(attacker_ptr, 100);
+    update_player_turn_energy(attacker_ptr, 100);
 
     if (!can_attack_with_main_hand(attacker_ptr) && !can_attack_with_sub_hand(attacker_ptr)
         && attacker_ptr->muta.has_none_of(mutation_attack_methods)) {

diff --git a/src/cmd-action/cmd-hissatsu.cpp b/src/cmd-action/cmd-hissatsu.cpp
index c487765..a6b1a54 100644 (file)
--- a/src/cmd-action/cmd-hissatsu.cpp
+++ b/src/cmd-action/cmd-hissatsu.cpp
@@ -348,7 +348,7 @@ void do_cmd_hissatsu(player_type *creature_ptr)
     if (!exe_spell(creature_ptr, REALM_HISSATSU, n, SPELL_CAST))
         return;
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     /* Use some mana */
     creature_ptr->csp -= spell.smana;
@@ -422,7 +422,7 @@ void do_cmd_gain_hissatsu(player_type *creature_ptr)
     if (!gain) {
         msg_print(_("何も覚えられなかった。", "You were not able to learn any special attacks."));
     } else {
-        take_turn(creature_ptr, 100);
+        update_player_turn_energy(creature_ptr, 100);
     }
 
     creature_ptr->update |= (PU_SPELLS);

diff --git a/src/cmd-action/cmd-mane.cpp b/src/cmd-action/cmd-mane.cpp
index 8143202..eb9b5e7 100644 (file)
--- a/src/cmd-action/cmd-mane.cpp
+++ b/src/cmd-action/cmd-mane.cpp
@@ -1137,7 +1137,7 @@ bool do_cmd_mane(player_type *creature_ptr, bool baigaesi)
         creature_ptr->mane_dam[j] = creature_ptr->mane_dam[j + 1];
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     creature_ptr->redraw |= (PR_IMITATION);
     creature_ptr->window_flags |= (PW_PLAYER);

diff --git a/src/cmd-action/cmd-mind.cpp b/src/cmd-action/cmd-mind.cpp
index 42accd6..2a1b764 100644 (file)
--- a/src/cmd-action/cmd-mind.cpp
+++ b/src/cmd-action/cmd-mind.cpp
@@ -300,12 +300,12 @@ static void mind_turn_passing(player_type *caster_ptr, cm_type *cm_ptr)
 {
     if (cm_ptr->on_mirror && (caster_ptr->pclass == CLASS_MIRROR_MASTER)) {
         if (cm_ptr->n == 3 || cm_ptr->n == 5 || cm_ptr->n == 7 || cm_ptr->n == 16) {
-            take_turn(caster_ptr, 50);
+            update_player_turn_energy(caster_ptr, 50);
             return;
         }
     }
 
-    take_turn(caster_ptr, 100);
+    update_player_turn_energy(caster_ptr, 100);
 }
 
 static bool judge_mind_chance(player_type *caster_ptr, cm_type *cm_ptr)

diff --git a/src/cmd-action/cmd-move.cpp b/src/cmd-action/cmd-move.cpp
index 78a5395..67bd666 100644 (file)
--- a/src/cmd-action/cmd-move.cpp
+++ b/src/cmd-action/cmd-move.cpp
@@ -104,7 +104,7 @@ void do_cmd_go_up(player_type *creature_ptr)
         creature_ptr->leaving = TRUE;
         creature_ptr->oldpx = 0;
         creature_ptr->oldpy = 0;
-        take_turn(creature_ptr, 100);
+        update_player_turn_energy(creature_ptr, 100);
         return;
     }
 
@@ -116,7 +116,7 @@ void do_cmd_go_up(player_type *creature_ptr)
     if (!go_up)
         return;
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     if (autosave_l)
         do_cmd_save_game(creature_ptr, TRUE);
@@ -215,7 +215,7 @@ void do_cmd_go_down(player_type *creature_ptr)
         creature_ptr->leaving = TRUE;
         creature_ptr->oldpx = 0;
         creature_ptr->oldpy = 0;
-        take_turn(creature_ptr, 100);
+        update_player_turn_energy(creature_ptr, 100);
         return;
     }
 
@@ -240,7 +240,7 @@ void do_cmd_go_down(player_type *creature_ptr)
         prepare_change_floor_mode(creature_ptr, CFM_FIRST_FLOOR);
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (autosave_l)
         do_cmd_save_game(creature_ptr, TRUE);
 
@@ -305,7 +305,7 @@ void do_cmd_walk(player_type *creature_ptr, bool pickup)
     bool more = FALSE;
     DIRECTION dir;
     if (get_rep_dir(creature_ptr, &dir, FALSE)) {
-        take_turn(creature_ptr, 100);
+        update_player_turn_energy(creature_ptr, 100);
         if ((dir != 5) && (creature_ptr->special_defense & KATA_MUSOU))
             set_action(creature_ptr, ACTION_NONE);
 
@@ -329,7 +329,7 @@ void do_cmd_walk(player_type *creature_ptr, bool pickup)
             creature_ptr->oldpy = randint1(MAX_HGT - 2);
             creature_ptr->oldpx = randint1(MAX_WID - 2);
             change_wild_mode(creature_ptr, TRUE);
-            take_turn(creature_ptr, 100);
+            update_player_turn_energy(creature_ptr, 100);
         }
     }
 
@@ -375,7 +375,7 @@ void do_cmd_stay(player_type *creature_ptr, bool pickup)
         command_arg = 0;
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (pickup)
         mpe_mode |= MPE_DO_PICKUP;
 
@@ -421,7 +421,7 @@ void do_cmd_rest(player_type *creature_ptr)
     if (creature_ptr->special_defense & NINJA_S_STEALTH)
         set_superstealth(creature_ptr, FALSE);
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (command_arg > 100)
         chg_virtue(creature_ptr, V_DILIGENCE, -1);
 

diff --git a/src/cmd-action/cmd-open-close.cpp b/src/cmd-action/cmd-open-close.cpp
index f868009..d7a9868 100644 (file)
--- a/src/cmd-action/cmd-open-close.cpp
+++ b/src/cmd-action/cmd-open-close.cpp
@@ -41,7 +41,7 @@ static bool exe_open_chest(player_type *creature_ptr, POSITION y, POSITION x, OB
     bool flag = TRUE;
     bool more = FALSE;
     object_type *o_ptr = &creature_ptr->current_floor_ptr->o_list[o_idx];
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (o_ptr->pval > 0) {
         flag = FALSE;
         int i = creature_ptr->skill_dis;
@@ -122,7 +122,7 @@ void do_cmd_open(player_type *creature_ptr)
         if (!has_flag(f_info[feat].flags, FF_OPEN) && !o_idx) {
             msg_print(_("そこには開けるものが見当たらない。", "You see nothing there to open."));
         } else if (g_ptr->m_idx && creature_ptr->riding != g_ptr->m_idx) {
-            take_turn(creature_ptr, 100);
+            update_player_turn_energy(creature_ptr, 100);
             msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!"));
             do_cmd_attack(creature_ptr, y, x, HISSATSU_NONE);
         } else if (o_idx) {
@@ -173,7 +173,7 @@ void do_cmd_close(player_type *creature_ptr)
         if (!has_flag(f_info[feat].flags, FF_CLOSE)) {
             msg_print(_("そこには閉じるものが見当たらない。", "You see nothing there to close."));
         } else if (g_ptr->m_idx) {
-            take_turn(creature_ptr, 100);
+            update_player_turn_energy(creature_ptr, 100);
             msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!"));
             do_cmd_attack(creature_ptr, y, x, HISSATSU_NONE);
         } else {
@@ -287,7 +287,7 @@ void do_cmd_bash(player_type *creature_ptr)
         if (!has_flag(f_info[feat].flags, FF_BASH)) {
             msg_print(_("そこには体当たりするものが見当たらない。", "You see nothing there to bash."));
         } else if (g_ptr->m_idx) {
-            take_turn(creature_ptr, 100);
+            update_player_turn_energy(creature_ptr, 100);
             msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!"));
             do_cmd_attack(creature_ptr, y, x, HISSATSU_NONE);
         } else {
@@ -359,11 +359,11 @@ void do_cmd_spike(player_type *creature_ptr)
     } else if (!get_spike(creature_ptr, &item)) {
         msg_print(_("くさびを持っていない！", "You have no spikes!"));
     } else if (g_ptr->m_idx) {
-        take_turn(creature_ptr, 100);
+        update_player_turn_energy(creature_ptr, 100);
         msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!"));
         do_cmd_attack(creature_ptr, y, x, HISSATSU_NONE);
     } else {
-        take_turn(creature_ptr, 100);
+        update_player_turn_energy(creature_ptr, 100);
         msg_format(_("%sにくさびを打ち込んだ。", "You jam the %s with a spike."), f_info[feat].name.c_str());
         cave_alter_feat(creature_ptr, y, x, FF_SPIKE);
         vary_item(creature_ptr, item, -1);

diff --git a/src/cmd-action/cmd-others.cpp b/src/cmd-action/cmd-others.cpp
index 84998a5..0bd763f 100644 (file)
--- a/src/cmd-action/cmd-others.cpp
+++ b/src/cmd-action/cmd-others.cpp
@@ -50,7 +50,7 @@ void do_cmd_search(player_type *creature_ptr)
         command_arg = 0;
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     search(creature_ptr);
 
     if (creature_ptr->action == ACTION_SEARCH)
@@ -70,7 +70,7 @@ static bool exe_alter(player_type *creature_ptr)
     FEAT_IDX feat = get_feat_mimic(g_ptr);
     feature_type *f_ptr;
     f_ptr = &f_info[feat];
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (g_ptr->m_idx) {
         do_cmd_attack(creature_ptr, y, x, HISSATSU_NONE);
         return FALSE;

diff --git a/src/cmd-action/cmd-pet.cpp b/src/cmd-action/cmd-pet.cpp
index 39af49a..0e668a5 100644 (file)
--- a/src/cmd-action/cmd-pet.cpp
+++ b/src/cmd-action/cmd-pet.cpp
@@ -223,7 +223,7 @@ bool do_cmd_riding(player_type *creature_ptr, bool force)
             return FALSE;
 
         if (g_ptr->m_idx) {
-            take_turn(creature_ptr, 100);
+            update_player_turn_energy(creature_ptr, 100);
 
             msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!"));
 
@@ -278,7 +278,7 @@ bool do_cmd_riding(player_type *creature_ptr, bool force)
         }
         if (r_info[m_ptr->r_idx].level > randint1((creature_ptr->skill_exp[GINOU_RIDING] / 50 + creature_ptr->lev / 2 + 20))) {
             msg_print(_("うまく乗れなかった。", "You failed to ride."));
-            take_turn(creature_ptr, 100);
+            update_player_turn_energy(creature_ptr, 100);
             return FALSE;
         }
 
@@ -299,7 +299,7 @@ bool do_cmd_riding(player_type *creature_ptr, bool force)
             health_track(creature_ptr, 0);
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     /* Mega-Hack -- Forget the view and lite */
     creature_ptr->update |= (PU_UN_VIEW | PU_UN_LITE);

diff --git a/src/cmd-action/cmd-spell.cpp b/src/cmd-action/cmd-spell.cpp
index 39f7556..cb71e76 100644 (file)
--- a/src/cmd-action/cmd-spell.cpp
+++ b/src/cmd-action/cmd-spell.cpp
@@ -908,7 +908,7 @@ void do_cmd_study(player_type *caster_ptr)
 #endif
     }
 
-    take_turn(caster_ptr, 100);
+    update_player_turn_energy(caster_ptr, 100);
 
     switch (mp_ptr->spell_book) {
     case TV_LIFE_BOOK:
@@ -1302,7 +1302,7 @@ bool do_cmd_cast(player_type *caster_ptr)
         }
     }
 
-    take_turn(caster_ptr, 100);
+    update_player_turn_energy(caster_ptr, 100);
 
     /* Over-exert the player */
     if (over_exerted) {

diff --git a/src/cmd-action/cmd-tunnel.cpp b/src/cmd-action/cmd-tunnel.cpp
index 606e677..d5ef83a 100644 (file)
--- a/src/cmd-action/cmd-tunnel.cpp
+++ b/src/cmd-action/cmd-tunnel.cpp
@@ -60,7 +60,7 @@ void do_cmd_tunnel(player_type *creature_ptr)
     else if (!has_flag(f_info[feat].flags, FF_TUNNEL))
         msg_print(_("そこは掘れない。", "You can't tunnel through that."));
     else if (g_ptr->m_idx) {
-        take_turn(creature_ptr, 100);
+        update_player_turn_energy(creature_ptr, 100);
         msg_print(_("モンスターが立ちふさがっている！", "There is a monster in the way!"));
         do_cmd_attack(creature_ptr, y, x, HISSATSU_NONE);
     } else

diff --git a/src/cmd-building/cmd-building.cpp b/src/cmd-building/cmd-building.cpp
index e52e40d..54ba74c 100644 (file)
--- a/src/cmd-building/cmd-building.cpp
+++ b/src/cmd-building/cmd-building.cpp
@@ -308,7 +308,7 @@ void do_cmd_building(player_type *player_ptr)
 {
        if (player_ptr->wild_mode) return;
 
-       take_turn(player_ptr, 100);
+       update_player_turn_energy(player_ptr, 100);
 
        if (!cave_has_flag_bold(player_ptr->current_floor_ptr, player_ptr->y, player_ptr->x, FF_BLDG))
        {

diff --git a/src/cmd-item/cmd-destroy.cpp b/src/cmd-item/cmd-destroy.cpp
index 8bb4bd5..4381893 100644 (file)
--- a/src/cmd-item/cmd-destroy.cpp
+++ b/src/cmd-item/cmd-destroy.cpp
@@ -212,7 +212,7 @@ void do_cmd_destroy(player_type *creature_ptr)
     destroy_ptr->o_ptr->number = destroy_ptr->amt;
     describe_flavor(creature_ptr, destroy_ptr->o_name, destroy_ptr->o_ptr, 0);
     destroy_ptr->o_ptr->number = destroy_ptr->old_number;
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (!can_player_destroy_object(creature_ptr, destroy_ptr->o_ptr)) {
         reset_player_turn(creature_ptr);
         msg_format(_("%sは破壊不可能だ。", "You cannot destroy %s."), destroy_ptr->o_name);

diff --git a/src/cmd-item/cmd-eat.cpp b/src/cmd-item/cmd-eat.cpp
index 968aba3..811b7e8 100644 (file)
--- a/src/cmd-item/cmd-eat.cpp
+++ b/src/cmd-item/cmd-eat.cpp
@@ -269,7 +269,7 @@ void exe_eat_food(player_type *creature_ptr, INVENTORY_IDX item)
 
     sound(SOUND_EAT);
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     /* Object level */
     int lev = k_info[o_ptr->k_idx].level;

diff --git a/src/cmd-item/cmd-equipment.cpp b/src/cmd-item/cmd-equipment.cpp
index 9d66c88..7b44f11 100644 (file)
--- a/src/cmd-item/cmd-equipment.cpp
+++ b/src/cmd-item/cmd-equipment.cpp
@@ -230,7 +230,7 @@ void do_cmd_wield(player_type *creature_ptr)
         autopick_alter_item(creature_ptr, item, FALSE);
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     q_ptr = &forge;
     object_copy(q_ptr, o_ptr);
     q_ptr->number = 1;
@@ -330,12 +330,12 @@ void do_cmd_takeoff(player_type *creature_ptr)
             msg_print(_("呪いを打ち破った。", "You break the curse."));
         } else {
             msg_print(_("装備を外せなかった。", "You couldn't remove the equipment."));
-            take_turn(creature_ptr, 50);
+            update_player_turn_energy(creature_ptr, 50);
             return;
         }
     }
 
-    take_turn(creature_ptr, 50);
+    update_player_turn_energy(creature_ptr, 50);
     (void)inven_takeoff(creature_ptr, item, 255);
     verify_equip_slot(creature_ptr, item);
     calc_android_exp(creature_ptr);

diff --git a/src/cmd-item/cmd-item.cpp b/src/cmd-item/cmd-item.cpp
index 0bb8e70..863fc2d 100644 (file)
--- a/src/cmd-item/cmd-item.cpp
+++ b/src/cmd-item/cmd-item.cpp
@@ -131,7 +131,7 @@ void do_cmd_drop(player_type *creature_ptr)
             return;
     }
 
-    take_turn(creature_ptr, 50);
+    update_player_turn_energy(creature_ptr, 50);
     drop_from_inventory(creature_ptr, item, amt);
     if (item >= INVEN_MAIN_HAND) {
         verify_equip_slot(creature_ptr, item);

diff --git a/src/cmd-item/cmd-magiceat.cpp b/src/cmd-item/cmd-magiceat.cpp
index 83f14c9..ac374d7 100644 (file)
--- a/src/cmd-item/cmd-magiceat.cpp
+++ b/src/cmd-item/cmd-magiceat.cpp
@@ -572,7 +572,7 @@ bool do_cmd_magic_eater(player_type *creature_ptr, bool only_browse, bool powerf
                sound(SOUND_FAIL);
                if (randint1(100) >= chance)
                        chg_virtue(creature_ptr, V_CHANCE,-1);
-               take_turn(creature_ptr, 100);
+               update_player_turn_energy(creature_ptr, 100);
 
                return TRUE;
        }
@@ -600,7 +600,7 @@ bool do_cmd_magic_eater(player_type *creature_ptr, bool only_browse, bool powerf
                if (randint1(100) < chance)
                        chg_virtue(creature_ptr, V_CHANCE,1);
        }
-       take_turn(creature_ptr, 100);
+       update_player_turn_energy(creature_ptr, 100);
        if (tval == TV_ROD) creature_ptr->magic_num1[item] += k_info[k_idx].pval * EATER_ROD_CHARGE;
        else creature_ptr->magic_num1[item] -= EATER_CHARGE;
 

diff --git a/src/cmd-item/cmd-refill.cpp b/src/cmd-item/cmd-refill.cpp
index 9930e39..6414e06 100644 (file)
--- a/src/cmd-item/cmd-refill.cpp
+++ b/src/cmd-item/cmd-refill.cpp
@@ -40,7 +40,7 @@ static void do_cmd_refill_lamp(player_type *user_ptr)
     BIT_FLAGS flgs[TR_FLAG_SIZE], flgs2[TR_FLAG_SIZE];
     object_flags(user_ptr, o_ptr, flgs);
 
-    take_turn(user_ptr, 50);
+    update_player_turn_energy(user_ptr, 50);
     j_ptr = &user_ptr->inventory_list[INVEN_LITE];
     object_flags(user_ptr, j_ptr, flgs2);
     j_ptr->xtra4 += o_ptr->xtra4;
@@ -80,7 +80,7 @@ static void do_cmd_refill_torch(player_type *user_ptr)
     BIT_FLAGS flgs[TR_FLAG_SIZE], flgs2[TR_FLAG_SIZE];
     object_flags(user_ptr, o_ptr, flgs);
 
-    take_turn(user_ptr, 50);
+    update_player_turn_energy(user_ptr, 50);
     j_ptr = &user_ptr->inventory_list[INVEN_LITE];
     object_flags(user_ptr, j_ptr, flgs2);
     j_ptr->xtra4 += o_ptr->xtra4 + 5;

diff --git a/src/cmd-item/cmd-smith.cpp b/src/cmd-item/cmd-smith.cpp
index 3ba08bd..1a44378 100644 (file)
--- a/src/cmd-item/cmd-smith.cpp
+++ b/src/cmd-item/cmd-smith.cpp
@@ -261,7 +261,7 @@ static void drain_essence(player_type *creature_ptr)
             return;
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     object_flags(creature_ptr, o_ptr, old_flgs);
     if (has_flag(old_flgs, TR_KILL_DRAGON))
@@ -907,7 +907,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode)
         if (es_ptr->add == ESSENCE_ATTACK) {
             if ((o_ptr->to_h >= creature_ptr->lev / 5 + 5) && (o_ptr->to_d >= creature_ptr->lev / 5 + 5)) {
                 msg_print(_("改良に失敗した。", "You failed to enchant."));
-                take_turn(creature_ptr, 100);
+                update_player_turn_energy(creature_ptr, 100);
                 return;
             } else {
                 if (o_ptr->to_h < creature_ptr->lev / 5 + 5)
@@ -918,7 +918,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode)
         } else if (es_ptr->add == ESSENCE_AC) {
             if (o_ptr->to_a >= creature_ptr->lev / 5 + 5) {
                 msg_print(_("改良に失敗した。", "You failed to enchant."));
-                take_turn(creature_ptr, 100);
+                update_player_turn_energy(creature_ptr, 100);
                 return;
             } else {
                 if (o_ptr->to_a < creature_ptr->lev / 5 + 5)
@@ -982,7 +982,7 @@ static void add_essence(player_type *creature_ptr, ESSENCE_IDX mode)
         }
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     _(msg_format("%sに%sの能力を付加しました。", o_name, es_ptr->add_name), msg_format("You have added ability of %s to %s.", es_ptr->add_name, o_name));
     creature_ptr->update |= (PU_COMBINE | PU_REORDER);
     creature_ptr->window_flags |= (PW_INVEN);
@@ -1013,7 +1013,7 @@ static void erase_essence(player_type *creature_ptr)
     if (!get_check(format(_("よろしいですか？ [%s]", "Are you sure? [%s]"), o_name)))
         return;
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     if (o_ptr->xtra3 == 1 + ESSENCE_SLAY_GLOVE) {
         o_ptr->to_h -= (o_ptr->xtra4 >> 8);

diff --git a/src/cmd-item/cmd-throw.cpp b/src/cmd-item/cmd-throw.cpp
index e9425ef..ae7fa0e 100644 (file)
--- a/src/cmd-item/cmd-throw.cpp
+++ b/src/cmd-item/cmd-throw.cpp
@@ -200,7 +200,7 @@ static void reflect_inventory_by_throw(player_type *creature_ptr, it_type *it_pt
 
 static void set_class_specific_throw_params(player_type *creature_ptr, it_type *it_ptr)
 {
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if ((creature_ptr->pclass == CLASS_ROGUE) || (creature_ptr->pclass == CLASS_NINJA))
         creature_ptr->energy_use -= creature_ptr->lev;
 

diff --git a/src/cmd-item/cmd-usestaff.cpp b/src/cmd-item/cmd-usestaff.cpp
index f8798bd..d38068e 100644 (file)
--- a/src/cmd-item/cmd-usestaff.cpp
+++ b/src/cmd-item/cmd-usestaff.cpp
@@ -317,7 +317,7 @@ void exe_use_staff(player_type *creature_ptr, INVENTORY_IDX item)
         return;
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     lev = k_info[o_ptr->k_idx].level;
     if (lev > 50)

diff --git a/src/cmd-item/cmd-zaprod.cpp b/src/cmd-item/cmd-zaprod.cpp
index d6ece8a..92bab2d 100644 (file)
--- a/src/cmd-item/cmd-zaprod.cpp
+++ b/src/cmd-item/cmd-zaprod.cpp
@@ -315,7 +315,7 @@ void exe_zap_rod(player_type *creature_ptr, INVENTORY_IDX item)
             return;
     }
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     lev = k_info[o_ptr->k_idx].level;
 

diff --git a/src/cmd-item/cmd-zapwand.cpp b/src/cmd-item/cmd-zapwand.cpp
index 7d24455..7780ee2 100644 (file)
--- a/src/cmd-item/cmd-zapwand.cpp
+++ b/src/cmd-item/cmd-zapwand.cpp
@@ -357,7 +357,7 @@ void exe_aim_wand(player_type *creature_ptr, INVENTORY_IDX item)
     }
     target_pet = old_target_pet;
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     /* Get the level */
     lev = k_info[o_ptr->k_idx].level;

diff --git a/src/core/player-processor.cpp b/src/core/player-processor.cpp
index 988f31c..c1f2450 100644 (file)
--- a/src/core/player-processor.cpp
+++ b/src/core/player-processor.cpp
@@ -271,7 +271,7 @@ void process_player(player_type *creature_ptr)
             command_cmd = SPECIAL_KEY_BUILDING;
             process_command(creature_ptr);
         } else if ((creature_ptr->paralyzed || creature_ptr->stun >= 100) && !cheat_immortal) {
-            take_turn(creature_ptr, 100);
+            update_player_turn_energy(creature_ptr, 100);
         } else if (creature_ptr->action == ACTION_REST) {
             if (creature_ptr->resting > 0) {
                 creature_ptr->resting--;
@@ -280,9 +280,9 @@ void process_player(player_type *creature_ptr)
                 creature_ptr->redraw |= (PR_STATE);
             }
 
-            take_turn(creature_ptr, 100);
+            update_player_turn_energy(creature_ptr, 100);
         } else if (creature_ptr->action == ACTION_FISH) {
-            take_turn(creature_ptr, 100);
+            update_player_turn_energy(creature_ptr, 100);
         } else if (creature_ptr->running) {
             run_step(creature_ptr, 0);
         } else if (travel.run) {

diff --git a/src/dungeon/quest.cpp b/src/dungeon/quest.cpp
index 228d71b..092a10d 100644 (file)
--- a/src/dungeon/quest.cpp
+++ b/src/dungeon/quest.cpp
@@ -324,7 +324,7 @@ void do_cmd_quest(player_type *player_ptr)
     if (player_ptr->wild_mode)
         return;
 
-    take_turn(player_ptr, 100);
+    update_player_turn_energy(player_ptr, 100);
 
     if (!cave_has_flag_bold(player_ptr->current_floor_ptr, player_ptr->y, player_ptr->x, FF_QUEST_ENTER)) {
         msg_print(_("ここにはクエストの入口はない。", "You see no quest level here."));

diff --git a/src/floor/wild.cpp b/src/floor/wild.cpp
index 8cef182..57ceca5 100644 (file)
--- a/src/floor/wild.cpp
+++ b/src/floor/wild.cpp
@@ -895,7 +895,7 @@ bool change_wild_mode(player_type *creature_ptr, bool encount)
         }
     }
 
-    take_turn(creature_ptr, 1000);
+    update_player_turn_energy(creature_ptr, 1000);
     creature_ptr->oldpx = creature_ptr->x;
     creature_ptr->oldpy = creature_ptr->y;
     if (hex_spelling_any(creature_ptr))

diff --git a/src/mind/mind-blue-mage.cpp b/src/mind/mind-blue-mage.cpp
index ef5d654..94fe5c2 100644 (file)
--- a/src/mind/mind-blue-mage.cpp
+++ b/src/mind/mind-blue-mage.cpp
@@ -111,7 +111,7 @@ bool do_cmd_cast_learned(player_type *caster_ptr)
         }
     }
 
-    take_turn(caster_ptr, 100);
+    update_player_turn_energy(caster_ptr, 100);
     caster_ptr->redraw |= PR_MANA;
     caster_ptr->window_flags |= PW_PLAYER | PW_SPELL;
     return TRUE;

diff --git a/src/mind/mind-elementalist.cpp b/src/mind/mind-elementalist.cpp
index 6de3674..62e584a 100644 (file)
--- a/src/mind/mind-elementalist.cpp
+++ b/src/mind/mind-elementalist.cpp
@@ -880,7 +880,7 @@ static bool try_cast_element_spell(player_type *caster_ptr, SPELL_IDX spell_idx,
             PROJECT_JUMP | PROJECT_KILL | PROJECT_GRID | PROJECT_ITEM);
         caster_ptr->csp = MAX(0, caster_ptr->csp - caster_ptr->msp * 10 / (20 + randint1(10)));
 
-        take_turn(caster_ptr, 100);
+        update_player_turn_energy(caster_ptr, 100);
         set_bits(caster_ptr->redraw, PR_MANA);
         set_bits(caster_ptr->window_flags, PW_PLAYER | PW_SPELL);
 
@@ -927,7 +927,7 @@ void do_cmd_element(player_type *caster_ptr)
         }
     }
 
-    take_turn(caster_ptr, 100);
+    update_player_turn_energy(caster_ptr, 100);
     set_bits(caster_ptr->redraw, PR_MANA);
     set_bits(caster_ptr->window_flags, PW_PLAYER | PW_SPELL);
 }

diff --git a/src/mind/mind-magic-eater.cpp b/src/mind/mind-magic-eater.cpp
index 6bae8fe..71ec92f 100644 (file)
--- a/src/mind/mind-magic-eater.cpp
+++ b/src/mind/mind-magic-eater.cpp
@@ -83,6 +83,6 @@ bool import_magic_device(player_type *user_ptr)
     msg_format(_("%sの魔力を取り込んだ。", "You absorb magic of %s."), o_name);
 
     vary_item(user_ptr, item, -999);
-    take_turn(user_ptr, 100);
+    update_player_turn_energy(user_ptr, 100);
     return TRUE;
 }

diff --git a/src/mind/mind-ninja.cpp b/src/mind/mind-ninja.cpp
index e3de163..6d76e89 100644 (file)
--- a/src/mind/mind-ninja.cpp
+++ b/src/mind/mind-ninja.cpp
@@ -417,7 +417,7 @@ bool cast_ninja_spell(player_type *caster_ptr, mind_ninja_type spell)
             }
 
             do_cmd_throw(caster_ptr, 1, FALSE, slot);
-            take_turn(caster_ptr, 100);
+            update_player_turn_energy(caster_ptr, 100);
         }
 
         break;

diff --git a/src/mind/mind-sniper.cpp b/src/mind/mind-sniper.cpp
index 8bd62cf..5905c04 100644 (file)
--- a/src/mind/mind-sniper.cpp
+++ b/src/mind/mind-sniper.cpp
@@ -525,7 +525,7 @@ static bool cast_sniper_spell(player_type *sniper_ptr, int spell)
        {
        case 0: /* Concentration */
                if (!snipe_concentrate(sniper_ptr)) return FALSE;
-               take_turn(sniper_ptr, 100);
+               update_player_turn_energy(sniper_ptr, 100);
                return TRUE;
        case 1: snipe_type = SP_LITE; break;
        case 2: snipe_type = SP_AWAY; break;

diff --git a/src/object-use/quaff-execution.cpp b/src/object-use/quaff-execution.cpp
index c4eb02a..7516568 100644 (file)
--- a/src/object-use/quaff-execution.cpp
+++ b/src/object-use/quaff-execution.cpp
@@ -119,7 +119,7 @@ void exe_quaff_potion(player_type *creature_ptr, INVENTORY_IDX item)
     object_type forge;
     object_type *q_ptr;
 
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
 
     if (creature_ptr->timewalk) {
         if (flush_failure)

diff --git a/src/object-use/read-execution.cpp b/src/object-use/read-execution.cpp
index b777c37..36db1eb 100644 (file)
--- a/src/object-use/read-execution.cpp
+++ b/src/object-use/read-execution.cpp
@@ -84,7 +84,7 @@ void exe_read(player_type *creature_ptr, INVENTORY_IDX item, bool known)
     int k, used_up, ident, lev;
     object_type *o_ptr;
     o_ptr = ref_item(creature_ptr, item);
-    take_turn(creature_ptr, 100);
+    update_player_turn_energy(creature_ptr, 100);
     if (cmd_limit_time_walk(creature_ptr))
         return;
 

diff --git a/src/player-status/player-energy.cpp b/src/player-status/player-energy.cpp
index 8384dd6..2119f6d 100644 (file)
--- a/src/player-status/player-energy.cpp
+++ b/src/player-status/player-energy.cpp
@@ -9,7 +9,7 @@
 #include "system/player-type-definition.h"
 
 // todo 第3引数 (演算：代入、加算、減算、他)を導入する。enumを使う
-void take_turn(player_type *creature_ptr, PERCENTAGE need_cost)
+void update_player_turn_energy(player_type *creature_ptr, PERCENTAGE need_cost)
 {
     creature_ptr->energy_use = (ENERGY)need_cost;
 }

diff --git a/src/player-status/player-energy.h b/src/player-status/player-energy.h
index f7123cd..c28731b 100644 (file)
--- a/src/player-status/player-energy.h
+++ b/src/player-status/player-energy.h
@@ -3,5 +3,5 @@
 #include "system/angband.h"
 
 typedef struct player_type player_type;
-void take_turn(player_type *creature_ptr, PERCENTAGE need_cost);
+void update_player_turn_energy(player_type *creature_ptr, PERCENTAGE need_cost);
 void reset_player_turn(player_type *creature_ptr);

diff --git a/src/status/action-setter.cpp b/src/status/action-setter.cpp
index 38e86fc..641c3ab 100644 (file)
--- a/src/status/action-setter.cpp
+++ b/src/status/action-setter.cpp
@@ -69,7 +69,7 @@ void set_action(player_type *creature_ptr, ACTION_IDX typ)
     }
     case ACTION_HAYAGAKE: {
         msg_print(_("足が重くなった。", "You are no longer walking extremely fast."));
-        take_turn(creature_ptr, 100);
+        update_player_turn_energy(creature_ptr, 100);
         break;
     }
     case ACTION_SPELL: {

diff --git a/src/store/cmd-store.cpp b/src/store/cmd-store.cpp
index 819a669..98c61fc 100644 (file)
--- a/src/store/cmd-store.cpp
+++ b/src/store/cmd-store.cpp
@@ -197,7 +197,7 @@ void do_cmd_store(player_type *player_ptr)
     player_ptr->town_num = old_town_num;
 
     select_floor_music(player_ptr);
-    take_turn(player_ptr, 100);
+    update_player_turn_energy(player_ptr, 100);
     current_world_ptr->character_icky_depth = 0;
     command_new = 0;
     command_see = FALSE;

diff --git a/src/world/world-turn-processor.cpp b/src/world/world-turn-processor.cpp
index cdd18e4..01f529d 100644 (file)
--- a/src/world/world-turn-processor.cpp
+++ b/src/world/world-turn-processor.cpp
@@ -219,7 +219,7 @@ void process_world(player_type *player_ptr)
                 player_ptr->oldpy = randint1(MAX_HGT - 2);
                 player_ptr->oldpx = randint1(MAX_WID - 2);
                 change_wild_mode(player_ptr, TRUE);
-                take_turn(player_ptr, 100);
+                update_player_turn_energy(player_ptr, 100);
             }
 
             player_ptr->invoking_midnight_curse = TRUE;