From 59db629f5f817fd5bde7a8f6e9369f481ca406d8 Mon Sep 17 00:00:00 2001 From: onpon4 Date: Sat, 4 Feb 2017 15:42:59 -0500 Subject: [PATCH] Fixed a failure to properly delete save files when requested. Also added removal of save files in the old (deprecated) format, after re-saving in the current format. --- src/engine.cpp | 6 ------ src/save.cpp | 6 +++++- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/engine.cpp b/src/engine.cpp index 711d4ff..fcd534f 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -372,12 +372,6 @@ void engine_cleanup() char filename[PATH_MAX]; strcpy(filename, ""); - - sprintf(filename, "%smusic.mod", engine.configDirectory); - remove(filename); - - sprintf(filename, "%smusic.s3m", engine.configDirectory); - remove(filename); #ifndef NOSOUND if (engine.useAudio) diff --git a/src/save.cpp b/src/save.cpp index 4b81af1..b5e8634 100644 --- a/src/save.cpp +++ b/src/save.cpp @@ -30,6 +30,7 @@ along with this program. If not, see . #include "gfx.h" #include "intermission.h" #include "player.h" +#include "save.h" #include "screen.h" #include "weapons.h" @@ -252,6 +253,9 @@ int save_load(int slot) weapons[W_PLAYER_WEAPON].imageIndex[0] = SP_PLASMA_GREEN; weapons[W_PLAYER_WEAPON].imageIndex[1] = SP_PLASMA_GREEN; player = game.thePlayer; + + save(slot); + remove(filename); } // Re-init all the planets in this system... @@ -457,7 +461,7 @@ int save_showSlots(SDL_Surface *savesSurface, int saveSlot, int x, int y) x + 253, y + 265, 100, 25)) { char filename[PATH_MAX]; - sprintf(filename, "%ssave%.2d.dat", engine.configDirectory, + sprintf(filename, "%ssave%.2d.sav", engine.configDirectory, saveSlot); remove(filename); save_initSlots();