[Refactor] #37353 do_riding() を do_cmd_riding() に改名．

diff --git a/src/cmd/cmd-pet.c b/src/cmd/cmd-pet.c
index eeeb55e..ba01213 100644 (file)
--- a/src/cmd/cmd-pet.c
+++ b/src/cmd/cmd-pet.c
@@ -272,7 +272,7 @@ void do_cmd_pet_dismiss(player_type *creature_ptr)
 * @param force 強制的に騎乗/下馬するならばTRUE
 * @return 騎乗/下馬できたらTRUE
 */
-bool do_riding(player_type *creature_ptr, bool force)
+bool do_cmd_riding(player_type *creature_ptr, bool force)
 {
        POSITION x, y;
        DIRECTION dir = 0;
@@ -938,7 +938,7 @@ void do_cmd_pet(player_type *creature_ptr)
 
        case PET_RIDING:
        {
-               (void)do_riding(creature_ptr, FALSE);
+               (void)do_cmd_riding(creature_ptr, FALSE);
                break;
        }
 

diff --git a/src/cmd/cmd-pet.h b/src/cmd/cmd-pet.h
index a66b563..e0d9e93 100644 (file)
--- a/src/cmd/cmd-pet.h
+++ b/src/cmd/cmd-pet.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "grid.h"
 
-extern bool do_riding(player_type *creature_ptr, bool force);
+extern bool do_cmd_riding(player_type *creature_ptr, bool force);
 extern PERCENTAGE calculate_upkeep(player_type *creature_ptr);
 extern void do_cmd_pet_dismiss(player_type *creature_pt);
 extern void do_cmd_pet(player_type *creature_ptr);

diff --git a/src/spells2.c b/src/spells2.c
index e36c03d..06b9eb4 100644 (file)
--- a/src/spells2.c
+++ b/src/spells2.c
@@ -4388,7 +4388,7 @@ bool rodeo(player_type *creature_ptr)
                msg_print(_("今は乗馬中だ。", "You ARE riding."));
                return FALSE;
        }
-       if (!do_riding(creature_ptr, TRUE)) return TRUE;
+       if (!do_cmd_riding(creature_ptr, TRUE)) return TRUE;
 
        m_ptr = &current_floor_ptr->m_list[creature_ptr->riding];
        r_ptr = &r_info[m_ptr->r_idx];