From 7b6648fae4821adcf25172e60177ed33b9ef804c Mon Sep 17 00:00:00 2001
From: deskull <deskull@users.sourceforge.jp>
Date: Thu, 2 Jan 2020 17:07:03 +0900
Subject: [PATCH] =?utf8?q?[Refactor]=20#38997=20get=5Fname()=20=E3=81=AB?=
 =?utf8?q?=20player=5Ftype=20*=20=E5=BC=95=E6=95=B0=E3=82=92=E8=BF=BD?=
 =?utf8?q?=E5=8A=A0=EF=BC=8E=20/=20Add=20player=5Ftype=20*=20argument=20to?=
 =?utf8?q?=20get=5Fname().?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 src/birth.c        |  2 +-
 src/cmd/cmd-dump.c |  2 +-
 src/files.c        | 12 ++++++------
 src/files.h        |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/birth.c b/src/birth.c
index ef1a61b77..241502bb7 100644
--- a/src/birth.c
+++ b/src/birth.c
@@ -4441,7 +4441,7 @@ static bool player_birth_aux(player_type *creature_ptr)
 	clear_from(23);
 
 	/* Get a name, recolor it, prepare savefile */
-	get_name();
+	get_name(creature_ptr);
 
 	/* Process the player name */
 	process_player_name(current_world_ptr->creating_savefile);
diff --git a/src/cmd/cmd-dump.c b/src/cmd/cmd-dump.c
index 29e612e1c..f22562a66 100644
--- a/src/cmd/cmd-dump.c
+++ b/src/cmd/cmd-dump.c
@@ -1065,7 +1065,7 @@ void do_cmd_player_status(player_type *creature_ptr)
 		/* Change name */
 		if (c == 'c')
 		{
-			get_name();
+			get_name(creature_ptr);
 
 			/* Process the player name */
 			process_player_name(FALSE);
diff --git a/src/files.c b/src/files.c
index 63854e31a..e6d9f4755 100644
--- a/src/files.c
+++ b/src/files.c
@@ -5919,24 +5919,24 @@ void process_player_name(bool sf)
  * What a horrible name for a global function.  
  * </pre>
  */
-void get_name(void)
+void get_name(player_type *creature_ptr)
 {
 	char tmp[64];
 
 	/* Save the player name */
-	strcpy(tmp, p_ptr->name);
+	strcpy(tmp, creature_ptr->name);
 
 	/* Prompt for a new name */
 	if (get_string(_("キャラクターの名前を入力して下さい: ", "Enter a name for your character: "), tmp, 15))
 	{
 		/* Use the name */
-		strcpy(p_ptr->name, tmp);
+		strcpy(creature_ptr->name, tmp);
 	}
 
-	if (0 == strlen(p_ptr->name))
+	if (0 == strlen(creature_ptr->name))
 	{
 		/* Use default name */
-		strcpy(p_ptr->name, "PLAYER");
+		strcpy(creature_ptr->name, "PLAYER");
 	}
 
 	strcpy(tmp,ap_ptr->title);
@@ -5946,7 +5946,7 @@ void get_name(void)
 #else
 	strcat(tmp, " ");
 #endif
-	strcat(tmp,p_ptr->name);
+	strcat(tmp,creature_ptr->name);
 
 	/* Re-Draw the name (in light blue) */
 	Term_erase(34, 1, 255);
diff --git a/src/files.h b/src/files.h
index 47a96ca06..6358ec497 100644
--- a/src/files.h
+++ b/src/files.h
@@ -42,7 +42,7 @@ extern errr check_load(void);
 extern bool show_file(bool show_version, concptr name, concptr what, int line, BIT_FLAGS mode);
 extern void do_cmd_help(void);
 extern void process_player_name(bool sf);
-extern void get_name(void);
+extern void get_name(player_type *creature_ptr);
 extern void do_cmd_save_game(int is_autosave);
 extern void do_cmd_save_and_exit(void);
 extern void exit_game_panic(void);
-- 
2.11.0