File relocate_save_file.patch of Package meritous

Overview Repositories Revisions Requests Users Attributes Meta

File relocate_save_file.patch of Package meritous (Revision 09423a62755a6de065b1fcae4db09964)

Currently displaying revision 09423a62755a6de065b1fcae4db09964 , Show latest

--- a/src/levelblit.c	2008-02-12 09:08:29.000000000 -0600
+++ b/src/levelblit.c	2008-02-12 09:11:10.000000000 -0600
@@ -27,6 +27,11 @@
 #include <SDL.h>
 #include <SDL_image.h>
 #include <assert.h>
+#ifdef SAVES_IN_HOME
+#include <unistd.h>
+#include <sys/types.h>
+#include <pwd.h>
+#endif
 
 #include "mapgen.h"
 #include "demon.h"
@@ -61,6 +66,11 @@
 
 FILE *record_file;
 char record_filename[256];
+#ifdef SAVES_IN_HOME
+char save_filename[1024];
+#else
+char save_filename = "SaveFile.sav";
+#endif
 
 void DrawLevel(int off_x, int off_y, int hide_not_visited, int fog_of_war);
 void DrawPlayer(int x, int y, int pl_dir, int pl_frm);
@@ -401,6 +411,9 @@
 	unsigned int stime = 0;
 	
 	FILE *wm_mask_file;
+#ifdef SAVES_IN_HOME
+	struct passwd *pw_record;
+#endif
 
 	if (argc > 1) {
 		for (i = 1; i < argc; i++) {
@@ -430,6 +443,28 @@
 		}
 	}
 
+#ifdef SAVES_IN_HOME
+	/* Determine the name of the save game file, which is
+	   $HOME/.meritous.sav on POSIX-based machines. */
+	pw_record = getpwuid(getuid());
+	save_filename[0] = 0;
+
+	if (pw_record != NULL) {
+		/* Just a bit of sanity checking on the length */
+		if (strlen(pw_record->pw_dir) > 1000) {
+			/* Just use the working directory */
+			strcpy(save_filename, "SaveFile.sav");
+		} else {
+			/* Set the filename based on the user's directory */
+			strcpy(save_filename, pw_record->pw_dir);
+			strcat(save_filename, "/.meritous.sav");
+		}
+	} else {
+	    	/* We couldn't find it, so just use the working directory */
+	    	strcpy(save_filename, "SaveFile.sav");
+	}
+#endif
+
 	if ((RECORDING) && (PLAYBACK)) {
 		exit(1);
 	}
@@ -509,7 +544,8 @@
 		ticker_tick = 0;
 		TitleScreenMusic();
 		
-		if (IsSaveFile()) {
+		if (IsSaveFile("SaveFile.sav") || IsSaveFile(save_filename)) {
+			/* See if we have the old or the new filename */
 			can_continue = 1;
 		} else {
 			can_continue = 0;
@@ -587,7 +623,15 @@
 			SDL_FreeSurface(title);
 			SDL_FreeSurface(title_pr);
 			if ((option == 0) && can_continue) {
+#ifdef SAVES_IN_HOME
+			    if (IsSaveFile(save_filename)) {
+				DungeonPlay(save_filename);
+			    } else {
+#endif
 				DungeonPlay("SaveFile.sav");
+#ifdef SAVES_IN_HOME
+			    }
+#endif
 			} else {
 				if (option == (0 + can_continue)) {
 					training = 0;
@@ -2258,7 +2302,7 @@
 			}
 			break;
 		case 31:
-			DoSaveGame();
+			DoSaveGame(save_filename);
 			break;
 		case 32:
 			CrystalSummon();
--- a/src/save.c	2008-02-04 10:10:16.000000000 -0600
+++ b/src/save.c	2008-02-12 09:08:29.000000000 -0600
@@ -152,16 +152,16 @@
 	gzclose(Filefp);
 }
 
-void DoSaveGame()
+void DoSaveGame(char *filename)
 {
 	SavingScreen(0, 0.0);
-	SaveGame("SaveFile.sav");
+	SaveGame(filename);
 }
 
-int IsSaveFile()
+int IsSaveFile(char *filename)
 {
 	FILE *fp;
-	if ((fp = fopen("SaveFile.sav", "rb")) != NULL) {
+	if ((fp = fopen(filename, "rb")) != NULL) {
 		fclose(fp);
 		return 1;
 	}
--- a/Makefile	2008-02-04 10:10:09.000000000 -0600
+++ b/Makefile	2008-02-12 09:08:29.000000000 -0600
@@ -19,7 +19,7 @@
 #   along with Meritous.  If not, see <http://www.gnu.org/licenses/>.
 #
 LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz
-CCFLAGS = -O2 -Wall `sdl-config --cflags` -g
+CCFLAGS = -DSAVES_IN_HOME -O2 -Wall `sdl-config --cflags` -g
 #
 OBJS = 	src/levelblit.o \
 		src/mapgen.o \

Places

File relocate_save_file.patch of Package meritous (Revision 09423a62755a6de065b1fcae4db09964)

Places