remove "separate savefiles" option. weird and unintuitive.

Author: Arisotura

src/frontend/qt_sdl/Config.cpp

@@ -274,8 +274,6 @@ LegacyEntry LegacyFile[] =
     {"LANDevice", 2, "LAN.Device", false},
     {"DirectLAN", 1, "LAN.DirectMode", false},
 
-    {"SavStaRelocSRAM", 1, "Savestate.RelocSRAM", false},
-
     {"AudioInterp", 0, "Audio.Interpolation", false},
     {"AudioBitDepth", 0, "Audio.BitDepth", false},
     {"AudioVolume", 0, "Audio.Volume", true},

src/frontend/qt_sdl/EmuInstance.cpp

@@ -759,16 +759,6 @@ bool EmuInstance::loadState(const std::string& filename)
     backupState = std::move(backup); // This will clean up any existing backup
     assert(backup == nullptr);
 
-    if (globalCfg.GetBool("Savestate.RelocSRAM") && ndsSave)
-    {
-        previousSaveFile = ndsSave->GetPath();
-
-        std::string savefile = filename.substr(lastSep(filename)+1);
-        savefile = getAssetPath(false, localCfg.GetString("SaveFilePath"), ".sav", savefile);
-        savefile += instanceFileSuffix();
-        ndsSave->SetPath(savefile, true);
-    }
-
     savestateLoaded = true;
 
     return true;
@@ -812,14 +802,6 @@ bool EmuInstance::saveState(const std::string& filename)
 
     Platform::CloseFile(file);
 
-    if (globalCfg.GetBool("Savestate.RelocSRAM") && ndsSave)
-    {
-        std::string savefile = filename.substr(lastSep(filename)+1);
-        savefile = getAssetPath(false, localCfg.GetString("SaveFilePath"), ".sav", savefile);
-        savefile += instanceFileSuffix();
-        ndsSave->SetPath(savefile, false);
-    }
-
     return true;
 }
 
@@ -829,15 +811,11 @@ void EmuInstance::undoStateLoad()
 
     // Rewind the backup state and put it in load mode
     backupState->Rewind(false);
+
     // pray that this works
     // what do we do if it doesn't???
     // but it should work.
     nds->DoSavestate(backupState.get());
-
-    if (ndsSave && (!previousSaveFile.empty()))
-    {
-        ndsSave->SetPath(previousSaveFile, true);
-    }
 }
 
 

src/frontend/qt_sdl/EmuInstance.h

@@ -308,7 +308,6 @@ class EmuInstance
 
     std::unique_ptr<melonDS::Savestate> backupState;
     bool savestateLoaded;
-    std::string previousSaveFile;
 
     std::unique_ptr<melonDS::ARCodeFile> cheatFile;
     bool cheatsOn;

src/frontend/qt_sdl/Window.cpp

@@ -652,14 +652,6 @@ MainWindow::MainWindow(int id, EmuInstance* inst, QWidget* parent) :
             actPathSettings = menu->addAction("Path settings");
             connect(actPathSettings, &QAction::triggered, this, &MainWindow::onOpenPathSettings);
 
-            {
-                QMenu * submenu = menu->addMenu("Savestate settings");
-
-                actSavestateSRAMReloc = submenu->addAction("Separate savefiles");
-                actSavestateSRAMReloc->setCheckable(true);
-                connect(actSavestateSRAMReloc, &QAction::triggered, this, &MainWindow::onChangeSavestateSRAMReloc);
-            }
-
             menu->addSeparator();
 
             actLimitFramerate = menu->addAction("Limit framerate");
@@ -745,8 +737,6 @@ MainWindow::MainWindow(int id, EmuInstance* inst, QWidget* parent) :
         actROMInfo->setEnabled(false);
         actRAMInfo->setEnabled(false);
 
-        actSavestateSRAMReloc->setChecked(globalCfg.GetBool("Savestate.RelocSRAM"));
-
         actScreenRotation[windowCfg.GetInt("ScreenRotation")]->setChecked(true);
 
         int screenGap = windowCfg.GetInt("ScreenGap");
@@ -2047,11 +2037,6 @@ void MainWindow::onInterfaceSettingsFinished(int res)
     emuThread->emuUnpause();
 }
 
-void MainWindow::onChangeSavestateSRAMReloc(bool checked)
-{
-    globalCfg.SetBool("Savestate.RelocSRAM", checked);
-}
-
 void MainWindow::onChangeScreenSize()
 {
     int factor = ((QAction*)sender())->data().toInt();

src/frontend/qt_sdl/Window.h

@@ -158,7 +158,6 @@ private slots:
     void onOpenInterfaceSettings();
     void onInterfaceSettingsFinished(int res);
     void onUpdateInterfaceSettings();
-    void onChangeSavestateSRAMReloc(bool checked);
     void onChangeScreenSize();
     void onChangeScreenRotation(QAction* act);
     void onChangeScreenGap(QAction* act);
@@ -274,7 +273,6 @@ private slots:
     QAction* actFirmwareSettings;
     QAction* actPathSettings;
     QAction* actInterfaceSettings;
-    QAction* actSavestateSRAMReloc;
     QAction* actScreenSize[4];
     QActionGroup* grpScreenRotation;
     QAction* actScreenRotation[screenRot_MAX];