プレイヤーが死亡して次のプレイで名前を変えるとセーブファイルが新規作

成されるバグを修正.

diff --git a/src/birth.c b/src/birth.c
index 55ad29c..0826da7 100644 (file)
--- a/src/birth.c
+++ b/src/birth.c
@@ -6223,8 +6223,8 @@ static bool player_birth_aux(void)
        /* Get a name, recolor it, prepare savefile */
        get_name();
 
-       /* Process the player name (accept as savefile name) */
-       process_player_name(TRUE);
+       /* Process the player name */
+       process_player_name(creating_savefile);
 
        /*** Edit character background ***/
        edit_history();

diff --git a/src/dungeon.c b/src/dungeon.c
index 46a54c5..3d76b33 100644 (file)
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -6646,6 +6646,8 @@ quit("
                quit(0);
        }
 
+       creating_savefile = new_game;
+
        /* Nothing loaded */
        if (!character_loaded)
        {
@@ -6760,6 +6762,8 @@ quit("
                }
        }
 
+       creating_savefile = FALSE;
+
        p_ptr->teleport_town = FALSE;
        p_ptr->sutemi = FALSE;
        world_monster = FALSE;

diff --git a/src/externs.h b/src/externs.h
index 933d8bb..4f34077 100644 (file)
--- a/src/externs.h
+++ b/src/externs.h
@@ -146,6 +146,7 @@ extern bool character_loaded;
 extern bool character_saved;
 extern bool character_icky;
 extern bool character_xtra;
+extern bool creating_savefile;
 extern u32b seed_flavor;
 extern u32b seed_town;
 extern s16b command_cmd;

diff --git a/src/variable.c b/src/variable.c
index 79023d3..321d0d5 100644 (file)
--- a/src/variable.c
+++ b/src/variable.c
@@ -88,6 +88,8 @@ bool character_saved;         /* The character was just saved to a savefile */
 bool character_icky;           /* The game is in an icky full screen mode */
 bool character_xtra;           /* The game is in an icky startup mode */
 
+bool creating_savefile;                /* New savefile is currently created */
+
 u32b seed_flavor;              /* Hack -- consistent object colors */
 u32b seed_town;                        /* Hack -- consistent town layout */