# HG changeset patch
# User edwarj4
# Date 1262358270 0
# Node ID 09da55b986ca58f35d317624c558d261d38bb148
# Parent  da77eb1839512d00722d164b482b0a2c8912db2f
Slightly modify savefile location and prompt

diff -r da77eb183951 -r 09da55b986ca rogue3/main.c
--- a/rogue3/main.c	Tue Dec 29 12:45:38 2009 +0000
+++ b/rogue3/main.c	Fri Jan 01 15:04:30 2010 +0000
@@ -70,8 +70,8 @@
         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 -r da77eb183951 -r 09da55b986ca rogue3/save.c
--- a/rogue3/save.c	Tue Dec 29 12:45:38 2009 +0000
+++ b/rogue3/save.c	Fri Jan 01 15:04:30 2010 +0000
@@ -40,7 +40,10 @@
     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 -r da77eb183951 -r 09da55b986ca rogue4/main.c
--- a/rogue4/main.c	Tue Dec 29 12:45:38 2009 +0000
+++ b/rogue4/main.c	Fri Jan 01 15:04:30 2010 +0000
@@ -77,9 +77,9 @@
         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 -r da77eb183951 -r 09da55b986ca rogue4/save.c
--- a/rogue4/save.c	Tue Dec 29 12:45:38 2009 +0000
+++ b/rogue4/save.c	Fri Jan 01 15:04:30 2010 +0000
@@ -48,7 +48,10 @@
     {
 	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)