[Refactor] #2520 set_fast() をset_acceleration() に改名した

diff --git a/src/blue-magic/blue-magic-caster.cpp b/src/blue-magic/blue-magic-caster.cpp
index c9ed7f2..a3c1b2d 100644 (file)
--- a/src/blue-magic/blue-magic-caster.cpp
+++ b/src/blue-magic/blue-magic-caster.cpp
@@ -323,7 +323,7 @@ static bool switch_cast_blue_magic(PlayerType *player_ptr, bmc_type *bmc_ptr, Mo
     case MonsterAbilityType::HOLD:
         return cast_blue_sleep(player_ptr, bmc_ptr);
     case MonsterAbilityType::HASTE:
-        (void)set_fast(player_ptr, randint1(20 + bmc_ptr->plev) + bmc_ptr->plev, false);
+        (void)set_acceleration(player_ptr, randint1(20 + bmc_ptr->plev) + bmc_ptr->plev, false);
         return true;
     case MonsterAbilityType::HAND_DOOM:
         return cast_blue_hand_doom(player_ptr, bmc_ptr);

diff --git a/src/cmd-action/cmd-mane.cpp b/src/cmd-action/cmd-mane.cpp
index c1ba7ef..984b8b3 100644 (file)
--- a/src/cmd-action/cmd-mane.cpp
+++ b/src/cmd-action/cmd-mane.cpp
@@ -895,7 +895,7 @@ static bool use_mane(PlayerType *player_ptr, MonsterAbilityType spell)
         sleep_monster(player_ptr, dir, plev);
         break;
     case MonsterAbilityType::HASTE:
-        (void)set_fast(player_ptr, randint1(20 + plev) + plev, false);
+        (void)set_acceleration(player_ptr, randint1(20 + plev) + plev, false);
         break;
     case MonsterAbilityType::HAND_DOOM: {
         if (!get_aim_dir(player_ptr, &dir)) {

diff --git a/src/cmd-item/cmd-usestaff.cpp b/src/cmd-item/cmd-usestaff.cpp
index c60556f..9488d6e 100644 (file)
--- a/src/cmd-item/cmd-usestaff.cpp
+++ b/src/cmd-item/cmd-usestaff.cpp
@@ -235,7 +235,7 @@ int staff_effect(PlayerType *player_ptr, OBJECT_SUBTYPE_VALUE sval, bool *use_ch
     }
 
     case SV_STAFF_SPEED: {
-        if (set_fast(player_ptr, randint1(30) + (powerful ? 30 : 15), false)) {
+        if (set_acceleration(player_ptr, randint1(30) + (powerful ? 30 : 15), false)) {
             ident = true;
         }
         break;

diff --git a/src/cmd-item/cmd-zaprod.cpp b/src/cmd-item/cmd-zaprod.cpp
index 7c1d226..09c0e55 100644 (file)
--- a/src/cmd-item/cmd-zaprod.cpp
+++ b/src/cmd-item/cmd-zaprod.cpp
@@ -143,7 +143,7 @@ int rod_effect(PlayerType *player_ptr, OBJECT_SUBTYPE_VALUE sval, DIRECTION dir,
     }
 
     case SV_ROD_SPEED: {
-        if (set_fast(player_ptr, randint1(30) + (powerful ? 30 : 15), false)) {
+        if (set_acceleration(player_ptr, randint1(30) + (powerful ? 30 : 15), false)) {
             ident = true;
         }
         break;

diff --git a/src/mind/mind-mindcrafter.cpp b/src/mind/mind-mindcrafter.cpp
index 54cdd8b..8843533 100644 (file)
--- a/src/mind/mind-mindcrafter.cpp
+++ b/src/mind/mind-mindcrafter.cpp
@@ -249,7 +249,7 @@ bool cast_mindcrafter_spell(PlayerType *player_ptr, MindMindcrafterType spell)
 
         t = 10 + randint1((plev * 3) / 2);
         set_hero(player_ptr, t, false);
-        (void)set_fast(player_ptr, t, false);
+        (void)set_acceleration(player_ptr, t, false);
         break;
     }
     case MindMindcrafterType::TELEKINESIS:

diff --git a/src/mspell/mspell-dispel.cpp b/src/mspell/mspell-dispel.cpp
index b64c7be..efdb2bd 100644 (file)
--- a/src/mspell/mspell-dispel.cpp
+++ b/src/mspell/mspell-dispel.cpp
@@ -36,7 +36,7 @@
  */
 static void dispel_player(PlayerType *player_ptr)
 {
-    (void)set_fast(player_ptr, 0, true);
+    (void)set_acceleration(player_ptr, 0, true);
     set_lightspeed(player_ptr, 0, true);
     (void)BadStatusSetter(player_ptr).slowness(0, true);
     (void)set_shield(player_ptr, 0, true);

diff --git a/src/mutation/mutation-processor.cpp b/src/mutation/mutation-processor.cpp
index 06dc160..2b257fd 100644 (file)
--- a/src/mutation/mutation-processor.cpp
+++ b/src/mutation/mutation-processor.cpp
@@ -236,7 +236,7 @@ void process_world_aux_mutation(PlayerType *player_ptr)
         if (one_in_(2)) {
             msg_print(_("精力的でなくなった気がする。", "You feel less energetic."));
             if (player_ptr->effects()->acceleration()->is_fast()) {
-                set_fast(player_ptr, 0, true);
+                set_acceleration(player_ptr, 0, true);
             } else {
                 (void)bss.slowness(randint1(30) + 10, false);
             }
@@ -245,7 +245,7 @@ void process_world_aux_mutation(PlayerType *player_ptr)
             if (player_ptr->slow > 0) {
                 (void)bss.slowness(0, true);
             } else {
-                set_fast(player_ptr, randint1(30) + 10, false);
+                set_acceleration(player_ptr, randint1(30) + 10, false);
             }
         }
 

diff --git a/src/object-activation/activation-switcher.cpp b/src/object-activation/activation-switcher.cpp
index ca9ddba..e21cc83 100644 (file)
--- a/src/object-activation/activation-switcher.cpp
+++ b/src/object-activation/activation-switcher.cpp
@@ -243,15 +243,15 @@ bool switch_activation(PlayerType *player_ptr, ObjectType **o_ptr_ptr, const act
         return activate_resistance_elements(player_ptr);
     case RandomArtActType::SPEED:
         msg_print(_("明るく緑色に輝いている...", "It glows bright green..."));
-        (void)set_fast(player_ptr, randint1(20) + 20, false);
+        (void)set_acceleration(player_ptr, randint1(20) + 20, false);
         return true;
     case RandomArtActType::MID_SPEED:
         msg_print(_("明るく緑色に輝いている...", "It glows bright green..."));
-        (void)set_fast(player_ptr, randint1(50) + 50, false);
+        (void)set_acceleration(player_ptr, randint1(50) + 50, false);
         return true;
     case RandomArtActType::XTRA_SPEED:
         msg_print(_("明るく輝いている...", "It glows brightly..."));
-        (void)set_fast(player_ptr, randint1(75) + 75, false);
+        (void)set_acceleration(player_ptr, randint1(75) + 75, false);
         return true;
     case RandomArtActType::WRAITH:
         set_wraith_form(player_ptr, randint1(player_ptr->lev / 2) + (player_ptr->lev / 2), false);
@@ -263,7 +263,7 @@ bool switch_activation(PlayerType *player_ptr, ObjectType **o_ptr_ptr, const act
         (void)heroism(player_ptr, 25);
         return true;
     case RandomArtActType::HERO_SPEED:
-        (void)set_fast(player_ptr, randint1(50) + 50, false);
+        (void)set_acceleration(player_ptr, randint1(50) + 50, false);
         (void)heroism(player_ptr, 50);
         return true;
     case RandomArtActType::ACID_BALL_AND_RESISTANCE:

diff --git a/src/object-use/quaff/quaff-effects.cpp b/src/object-use/quaff/quaff-effects.cpp
index 9e4ca31..77bf5ae 100644 (file)
--- a/src/object-use/quaff/quaff-effects.cpp
+++ b/src/object-use/quaff/quaff-effects.cpp
@@ -379,7 +379,7 @@ bool QuaffEffects::speed()
         return false;
     }
 
-    return set_fast(this->player_ptr, randint1(25) + 15, false);
+    return set_acceleration(this->player_ptr, randint1(25) + 15, false);
 }
 
 /*!

diff --git a/src/realm/realm-craft.cpp b/src/realm/realm-craft.cpp
index db91ae2..9720c5a 100644 (file)
--- a/src/realm/realm-craft.cpp
+++ b/src/realm/realm-craft.cpp
@@ -447,7 +447,7 @@ concptr do_craft_spell(PlayerType *player_ptr, SPELL_IDX spell, SpellProcessType
             }
 
             if (cast) {
-                set_fast(player_ptr, randint1(sides) + base, false);
+                set_acceleration(player_ptr, randint1(sides) + base, false);
             }
         }
         break;

diff --git a/src/realm/realm-crusade.cpp b/src/realm/realm-crusade.cpp
index 221e77f..3891131 100644 (file)
--- a/src/realm/realm-crusade.cpp
+++ b/src/realm/realm-crusade.cpp
@@ -765,7 +765,7 @@ concptr do_crusade_spell(PlayerType *player_ptr, SPELL_IDX spell, SpellProcessTy
 
             set_hero(player_ptr, randint1(base) + base, false);
             set_blessed(player_ptr, randint1(base) + base, false);
-            set_fast(player_ptr, randint1(sp_sides) + sp_base, false);
+            set_acceleration(player_ptr, randint1(sp_sides) + sp_base, false);
             set_protevil(player_ptr, randint1(base) + base, false);
             (void)BadStatusSetter(player_ptr).fear(0);
         }

diff --git a/src/realm/realm-death.cpp b/src/realm/realm-death.cpp
index a44a500..17e2bc6 100644 (file)
--- a/src/realm/realm-death.cpp
+++ b/src/realm/realm-death.cpp
@@ -563,7 +563,7 @@ concptr do_death_spell(PlayerType *player_ptr, SPELL_IDX spell, SpellProcessType
 
             if (cast) {
                 (void)berserk(player_ptr, b_base + randint1(b_base));
-                set_fast(player_ptr, randint1(sp_sides) + sp_base, false);
+                set_acceleration(player_ptr, randint1(sp_sides) + sp_base, false);
             }
         }
         break;

diff --git a/src/realm/realm-life.cpp b/src/realm/realm-life.cpp
index 09959c8..f33d72a 100644 (file)
--- a/src/realm/realm-life.cpp
+++ b/src/realm/realm-life.cpp
@@ -662,7 +662,7 @@ concptr do_life_spell(PlayerType *player_ptr, SPELL_IDX spell, SpellProcessType
 
             if (cast) {
                 TIME_EFFECT v = randint1(base) + base;
-                set_fast(player_ptr, v, false);
+                set_acceleration(player_ptr, v, false);
                 set_oppose_acid(player_ptr, v, false);
                 set_oppose_elec(player_ptr, v, false);
                 set_oppose_fire(player_ptr, v, false);

diff --git a/src/realm/realm-sorcery.cpp b/src/realm/realm-sorcery.cpp
index 3f69df5..5b2c5de 100644 (file)
--- a/src/realm/realm-sorcery.cpp
+++ b/src/realm/realm-sorcery.cpp
@@ -351,7 +351,7 @@ concptr do_sorcery_spell(PlayerType *player_ptr, SPELL_IDX spell, SpellProcessTy
             }
 
             if (cast) {
-                set_fast(player_ptr, randint1(sides) + base, false);
+                set_acceleration(player_ptr, randint1(sides) + base, false);
             }
         }
         break;

diff --git a/src/status/buff-setter.cpp b/src/status/buff-setter.cpp
index 1393d47..21c54c0 100644 (file)
--- a/src/status/buff-setter.cpp
+++ b/src/status/buff-setter.cpp
@@ -117,7 +117,7 @@ void reset_tim_flags(PlayerType *player_ptr)
  * @param do_dec 現在の継続時間より長い値のみ上書きする
  * @return ステータスに影響を及ぼす変化があった場合TRUEを返す。
  */
-bool set_fast(PlayerType *player_ptr, TIME_EFFECT v, bool do_dec)
+bool set_acceleration(PlayerType *player_ptr, TIME_EFFECT v, bool do_dec)
 {
     bool notice = false;
     v = (v > 10000) ? 10000 : (v < 0) ? 0
@@ -161,7 +161,7 @@ bool set_fast(PlayerType *player_ptr, TIME_EFFECT v, bool do_dec)
 
 bool mod_acceleration(PlayerType *player_ptr, const TIME_EFFECT v, const bool do_dec)
 {
-    return set_fast(player_ptr, player_ptr->effects()->acceleration()->current() + v, do_dec);
+    return set_acceleration(player_ptr, player_ptr->effects()->acceleration()->current() + v, do_dec);
 }
 
 /*!

diff --git a/src/status/buff-setter.h b/src/status/buff-setter.h
index da791da..bf549e8 100644 (file)
--- a/src/status/buff-setter.h
+++ b/src/status/buff-setter.h
@@ -5,7 +5,7 @@
 enum class MimicKindType;
 class PlayerType;
 void reset_tim_flags(PlayerType *player_ptr);
-bool set_fast(PlayerType *player_ptr, TIME_EFFECT v, bool do_dec);
+bool set_acceleration(PlayerType *player_ptr, TIME_EFFECT v, bool do_dec);
 bool mod_acceleration(PlayerType *player_ptr, const TIME_EFFECT v, const bool do_dec);
 bool set_shield(PlayerType *player_ptr, TIME_EFFECT v, bool do_dec);
 bool set_magicdef(PlayerType *player_ptr, TIME_EFFECT v, bool do_dec);