From b24bc2e606b47b177d9ef796cd00050ac2b0b426 Mon Sep 17 00:00:00 2001
From: "John \"Elwin\" Edwards" <elwin@rlgallery.org>
Date: Fri, 1 Jan 2010 15:04:30 +0000
Subject: [PATCH] Slightly modify savefile location and prompt

---
 rogue3/main.c | 4 ++--
 rogue3/save.c | 5 ++++-
 rogue4/main.c | 6 +++---
 rogue4/save.c | 5 ++++-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/rogue3/main.c b/rogue3/main.c
index de14013..0f331cf 100644
--- a/rogue3/main.c
+++ b/rogue3/main.c
@@ -70,8 +70,8 @@ char **envp;
         strncpy(whoami, argv[2], 79);
         whoami[79] = '\0';
         use_savedir = TRUE;
-        /* look for savefile at SAVEDIR/UIDplayername.r3sav */
-        if (snprintf(file_name, 80, "%s%d%.10s.r3sav", SAVEDIR, md_getuid(), whoami) >= 80)
+        /* look for savefile at SAVEDIR/UID-playername.r3sav */
+        if (snprintf(file_name, 80, "%s%d-%.10s.r3sav", SAVEDIR, md_getuid(), whoami) >= 80)
         {
             /* this shouldn't happen */
             strcpy(file_name, "rogue3.save");
diff --git a/rogue3/save.c b/rogue3/save.c
index 03cb3bd..f8e7887 100644
--- a/rogue3/save.c
+++ b/rogue3/save.c
@@ -40,7 +40,10 @@ save_game()
     mpos = 0;
     if (file_name[0] != '\0')
     {
-	msg("Save file (%s)? ", file_name);
+	if (use_savedir)
+	    msg("Save game? ");
+	else
+	    msg("Save file (%s)? ", file_name);
 	do
 	{
 	    c = readchar(cw);
diff --git a/rogue4/main.c b/rogue4/main.c
index 23ec95e..ebfe201 100644
--- a/rogue4/main.c
+++ b/rogue4/main.c
@@ -77,9 +77,9 @@ char **envp;
         strncpy(whoami, argv[2], MAXSTR - 1);
         whoami[MAXSTR - 1] = '\0'; /* insurance */
         use_savedir = TRUE;
-        /* look for savefile at SAVEDIR/UIDplayername.r4sav */
-        if (snprintf(file_name, MAXSTR, "%s%d%.10s.r4sav", SAVEDIR, md_getuid(),
-            whoami) >= MAXSTR)
+        /* look for savefile at SAVEDIR/UID-playername.r4sav */
+        if (snprintf(file_name, MAXSTR, "%s%d-%.10s.r4sav", SAVEDIR, 
+            md_getuid(), whoami) >= MAXSTR)
         {
             /* Name is too long- this shouldn't happen */
             strcpy(file_name, "rogue4.save");
diff --git a/rogue4/save.c b/rogue4/save.c
index 3e7cf54..024eb35 100644
--- a/rogue4/save.c
+++ b/rogue4/save.c
@@ -48,7 +48,10 @@ over:
     {
 	for (;;)
 	{
-	    msg("save file (%s)? ", file_name);
+	    if (use_savedir)
+		msg("Save game? ");
+	    else
+		msg("save file (%s)? ", file_name);
 	    c = getchar();
 	    mpos = 0;
 	    if (c == ESCAPE)