From 0e65fa0caceab0b38aff0235df083d5290ba4240 Mon Sep 17 00:00:00 2001
From: zicodxx <>
Date: Fri, 2 Feb 2007 18:57:42 +0000
Subject: [PATCH] complete removal of broken Autosave feature

---
 dxx-changelog.txt |  1 +
 main/state.c      | 45 ++-------------------------------------------
 2 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/dxx-changelog.txt b/dxx-changelog.txt
index 25196a5e0..f40f2cd59 100755
--- a/dxx-changelog.txt
+++ b/dxx-changelog.txt
@@ -4,6 +4,7 @@ D2X-Rebirth Changelog
 --------
 main/gauges.c: corrected Y alignment of hud_show_homing_warning
 arch/ogl/ogl.c: don't draw bombs with transparency even if -gl_transparency is enabled
+main/state.c: complete removal of broken Autosave feature
 
 20070131
 --------
diff --git a/main/state.c b/main/state.c
index ac5b33df5..83096fc3c 100755
--- a/main/state.c
+++ b/main/state.c
@@ -381,8 +381,6 @@ int state_get_restore_file(char * fname, int multi)
 
 	if (choice > 0) {
 		strcpy( fname, filename[choice-1] );
-		if (choice != NUM_SAVES+1)		//no new default when restore from autosave
-			state_default_item = choice - 1;
 		return choice;
 	}
 	return 0;
@@ -496,11 +494,7 @@ int state_save_all(int between_levels, int secret_save, char *filename_override,
 		filename_override = filename;
 		sprintf(filename_override, SECRETC_FILENAME);
 	} else {
-		if (filename_override) {
-			strcpy( filename, filename_override);
-			sprintf(desc, "[autosave backup]");
-		}
-		else if (!(filenum = state_get_save_file(filename, desc, 0, blind_save)))
+		if (!(filenum = state_get_save_file(filename, desc, 0, blind_save)))
 		{
 			start_time();
 			return 0;
@@ -546,29 +540,6 @@ int state_save_all(int between_levels, int secret_save, char *filename_override,
 		}
 	}
 
-	//	Save file we're going to save over in last slot and call "[autosave backup]"
-	if (!filename_override) {
-		PHYSFS_file *tfp;
-
-		tfp = PHYSFSX_openWriteBuffered(filename);
-
-		if ( tfp ) {
-			char	newname[128];
-
-			#ifndef MACINTOSH
-			sprintf( newname, "%s.sg%x", Players[Player_num].callsign, NUM_SAVES );
-			#else
-			sprintf(newname, "Players/%s.sg%x", Players[Player_num].callsign, NUM_SAVES);
-			#endif
-
-			PHYSFS_seek(tfp, DESC_OFFSET);
-			PHYSFS_write(tfp, "[autosave backup]", sizeof(char) * DESC_LENGTH, 1);
-			PHYSFS_close(tfp);
-			PHYSFS_delete(newname);
-			PHYSFSX_rename(filename, newname);
-		}
-	}
-	
 	rval = state_save_all_sub(filename, desc, between_levels);
 	if (rval && !secret_save)
 		HUD_init_message("Game saved.");
@@ -911,7 +882,7 @@ int state_restore_all(int in_game, int secret_restore, char *filename_override)
 
 	if (filename_override) {
 		strcpy(filename, filename_override);
-		filenum = NUM_SAVES+1;		//	So we don't trigger autosave
+		filenum = NUM_SAVES+1; // place outside of save slots
 	} else if (!(filenum = state_get_restore_file(filename, 0)))	{
 		start_time();
 		return 0;
@@ -949,18 +920,6 @@ int state_restore_all(int in_game, int secret_restore, char *filename_override)
 		}
 	}
 
-	//	Changed, 11/15/95, MK, don't to autosave if restoring from main menu.
-	if ((filenum != (NUM_SAVES+1)) && in_game) {
-		char	temp_filename[128];
-		mprintf((0, "Doing autosave, filenum = %i, != %i!\n", filenum, NUM_SAVES+1));
-		#ifndef MACINTOSH
-		sprintf( temp_filename, "%s.sg%x", Players[Player_num].callsign, NUM_SAVES );
-		#else
-		sprintf(temp_filename, "Players/%s.sg%x", Players[Player_num].callsign, NUM_SAVES);
-		#endif
-		state_save_all(!in_game, secret_restore, temp_filename, 0);
-	}
-
 	if ( !secret_restore && in_game ) {
 		int choice;
 		choice =  nm_messagebox( NULL, 2, "Yes", "No", "Restore Game?" );