Merge pull request #1831 from b10z/alpha

Message on Save State (fix for issue #1783)

Author: skmp

libswirl/gui/gui.cpp

@@ -534,6 +534,8 @@ struct ReicastUI_impl : GUI {
 
         ImGui::Begin("Reicast", NULL, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize);
 
+
+
         ImGui::Columns(2, "buttons", false);
         if (ImGui::Button("Load State", ImVec2(150 * scaling, 50 * scaling)))
         {
@@ -542,13 +544,42 @@ struct ReicastUI_impl : GUI {
             virtualDreamcast->Resume();
         }
         ImGui::NextColumn();
+
+
         if (ImGui::Button("Save State", ImVec2(150 * scaling, 50 * scaling)))
         {
-            virtualDreamcast->SaveState();
-            gui_state = Closed;
-            virtualDreamcast->Resume();
+            if (!settings.savepopup.isShown) {
+                ImGui::OpenPopup("Warning!");
+                settings.savepopup.isShown = true;
+                SaveSettings();
+            }
+            else{
+                virtualDreamcast->SaveState();
+                gui_state = Closed;
+                virtualDreamcast->Resume();
+            }
+
+        }
+
+        if (ImGui::BeginPopupModal("Warning!"))
+        {
+            ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + 250.f * scaling);
+            ImGui::Text("Save states are not guaranteed to be compatible between releases, please use with caution and always save to VMU");
+            float currentwidth = ImGui::GetContentRegionAvailWidth();
+            ImGui::SetCursorPosX((currentwidth - 80.f * scaling) / 2.f + ImGui::GetStyle().WindowPadding.x);
+            if (ImGui::Button("Okay", ImVec2(80.f * scaling, 0.f)))
+            {
+                ImGui::CloseCurrentPopup();
+                virtualDreamcast->SaveState();
+                gui_state = Closed;
+                virtualDreamcast->Resume();
+
+            }
+            ImGui::SetItemDefaultFocus();
+            ImGui::EndPopup();
         }
 
+
         ImGui::NextColumn();
         if (ImGui::Button("Settings", ImVec2(150 * scaling, 50 * scaling)))
         {

libswirl/libswirl.cpp

@@ -279,6 +279,8 @@ void InitSettings()
     settings.dynarec.ScpuEnable = true;
     settings.dynarec.DspEnable = true;
 
+    settings.savepopup.isShown = false; // if false, popup on save state should appear
+
     settings.dreamcast.cable = 3;	// TV composite
     settings.dreamcast.region = 3;	// default
     settings.dreamcast.broadcast = 4;	// default
@@ -366,6 +368,8 @@ void LoadSettings(bool game_specific)
     settings.dynarec.ScpuEnable = cfgLoadInt(config_section, "Dynarec.ScpuEnabled", settings.dynarec.ScpuEnable);
     settings.dynarec.DspEnable = cfgLoadInt(config_section, "Dynarec.DspEnabled", settings.dynarec.DspEnable);
 
+    settings.savepopup.isShown = cfgLoadBool(config_section, "SavePopup.isShown", settings.savepopup.isShown);
+
     //disable_nvmem can't be loaded, because nvmem init is before cfg load
     settings.dreamcast.cable = cfgLoadInt(config_section, "Dreamcast.Cable", settings.dreamcast.cable);
     settings.dreamcast.region = cfgLoadInt(config_section, "Dreamcast.Region", settings.dreamcast.region);
@@ -511,6 +515,9 @@ void SaveSettings()
     cfgSaveBool("config", "Dreamcast.FullMMU", settings.dreamcast.FullMMU);
     cfgSaveBool("config", "Dynarec.idleskip", settings.dynarec.idleskip);
     cfgSaveBool("config", "Dynarec.unstable-opt", settings.dynarec.unstable_opt);
+
+    cfgSaveBool("config", "SavePopup.isShown", settings.savepopup.isShown);
+
     if (!safemode_game || !settings.dynarec.safemode)
         cfgSaveBool("config", "Dynarec.safe-mode", settings.dynarec.safemode);
     cfgSaveInt("config", "Dynarec.SmcCheckLevel", (int)settings.dynarec.SmcCheckLevel);
@@ -1185,4 +1192,4 @@ struct Dreamcast_impl : VirtualDreamcast {
 
 VirtualDreamcast* VirtualDreamcast::Create() {
     return new Dreamcast_impl();
-}
+}

libswirl/types.h

@@ -462,6 +462,10 @@ struct settings_t
 		string ElfFile;
 	} reios;
 
+	struct {
+		bool isShown;
+	} savepopup;
+
 	struct
 	{
 		bool UseMipmaps;