savestate slots

core/cfg/option.cpp

@@ -35,6 +35,7 @@ Option<int> Language("Dreamcast.Language", 1);		// English
 Option<bool> FullMMU("Dreamcast.FullMMU");
 Option<bool> ForceWindowsCE("Dreamcast.ForceWindowsCE");
 Option<bool> AutoSavestate("Dreamcast.AutoSavestate");
+Option<int> SavestateSlot("Dreamcast.SavestateSlot");
 
 // Sound
 

core/cfg/option.h

@@ -298,6 +298,7 @@ extern Option<int> Language;	// 0 -> JP, 1 -> EN, 2 -> DE, 3 -> FR, 4 -> SP, 5 -
 extern Option<bool> FullMMU;
 extern Option<bool> ForceWindowsCE;
 extern Option<bool> AutoSavestate;
+extern Option<int> SavestateSlot;
 
 // Sound
 

core/rend/gui.cpp

@@ -79,11 +79,11 @@ static void emuEventCallback(Event event)
 		break;
 	case Event::Start:
 		if (config::AutoSavestate && settings.imgread.ImagePath[0] != '\0')
-			dc_loadstate();
+			dc_loadstate(config::SavestateSlot);
 		break;
 	case Event::Terminate:
 		if (config::AutoSavestate && settings.imgread.ImagePath[0] != '\0')
-			dc_savestate();
+			dc_savestate(config::SavestateSlot);
 		break;
 	default:
 		break;
@@ -419,20 +419,35 @@ static void gui_display_commands()
 
     ImGui::Begin("##commands", NULL, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize);
 
-	ImGui::Columns(2, "buttons", false);
 	if (settings.imgread.ImagePath[0] == '\0')
 	{
         ImGui::PushItemFlag(ImGuiItemFlags_Disabled, true);
         ImGui::PushStyleVar(ImGuiStyleVar_Alpha, ImGui::GetStyle().Alpha * 0.5f);
 	}
-	if (ImGui::Button("Load State", ImVec2(150 * scaling, 50 * scaling)))
+	if (ImGui::Button("Load State", ImVec2(110 * scaling, 50 * scaling)))
 	{
-		gui_state = GuiState::SelectLoadingStates;
+		gui_state = GuiState::Closed;
+		dc_loadstate(config::SavestateSlot);
 	}
-	ImGui::NextColumn();
-	if (ImGui::Button("Save State", ImVec2(150 * scaling, 50 * scaling)))
+	ImGui::SameLine();
+	std::string slot = "Slot " + std::to_string((int)config::SavestateSlot + 1);
+	if (ImGui::Button(slot.c_str(), ImVec2(80 * scaling - ImGui::GetStyle().FramePadding.x, 50 * scaling)))
+		ImGui::OpenPopup("slot_select_popup");
+    if (ImGui::BeginPopup("slot_select_popup"))
+    {
+        for (int i = 0; i < 10; i++)
+            if (ImGui::Selectable(std::to_string(i + 1).c_str(), config::SavestateSlot == i, 0,
+            		ImVec2(ImGui::CalcTextSize("Slot 8").x, 0))) {
+                config::SavestateSlot = i;
+                SaveSettings();
+            }
+        ImGui::EndPopup();
+    }
+	ImGui::SameLine();
+	if (ImGui::Button("Save State", ImVec2(110 * scaling, 50 * scaling)))
 	{
-		gui_state = GuiState::SelectSavingStates;
+		gui_state = GuiState::Closed;
+		dc_savestate(config::SavestateSlot);
 	}
 	if (settings.imgread.ImagePath[0] == '\0')
 	{
@@ -440,7 +455,7 @@ static void gui_display_commands()
         ImGui::PopStyleVar();
 	}
 
-	ImGui::NextColumn();
+	ImGui::Columns(2, "buttons", false);
 	if (ImGui::Button("Settings", ImVec2(150 * scaling, 50 * scaling)))
 	{
 		gui_state = GuiState::Settings;
@@ -1931,40 +1946,6 @@ static void gui_display_loadscreen()
     ImGui::End();
 }
 
-void gui_select_save_states(bool saving) {
-    centerNextWindow();
-    ImGui::SetNextWindowSize(ImVec2(330 * scaling, 0));
-
-    ImGui::Begin("##select states", NULL, ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize);
-
-	ImGui::Columns(2, "buttons", false);
-
-	for (int i = 0; i < SAVE_STATES_CAPACITY; i++) {
-		if (i != 0)
-			ImGui::NextColumn();
-
-		char state_button_name[32];
-		sprintf(state_button_name, "State %d", i);
-		if (ImGui::Button(state_button_name, ImVec2(150 * scaling, 50 * scaling)))
-		{
-			gui_state = GuiState::Closed;
-			if (saving)
-				dc_savestate(i);
-			else
-				dc_loadstate(i);
-		}
-	}
-
-	ImGui::Columns(1, nullptr, false);
-	if (ImGui::Button("Cancel", ImVec2(300 * scaling + ImGui::GetStyle().ColumnsMinSpacing + ImGui::GetStyle().FramePadding.x * 2 - 1,
-			50 * scaling)))
-	{
-		gui_state = GuiState::Commands;
-	}
-
-	ImGui::End();
-}
-
 void gui_display_ui()
 {
 	if (gui_state == GuiState::Closed || gui_state == GuiState::VJoyEdit)
@@ -2021,12 +2002,6 @@ void gui_display_ui()
 	case GuiState::Cheats:
 		gui_cheats();
 		break;
-	case GuiState::SelectLoadingStates:
-		gui_select_save_states(false);
-		break;
-	case GuiState::SelectSavingStates:
-		gui_select_save_states(true);
-		break;
 	default:
 		die("Unknown UI state");
 		break;

core/rend/gui.h

@@ -48,9 +48,7 @@ enum class GuiState {
 	SelectDisk,
 	Loading,
 	NetworkStart,
-	Cheats,
-	SelectLoadingStates,
-	SelectSavingStates
+	Cheats
 };
 extern GuiState gui_state;
 
@@ -83,5 +81,3 @@ static inline bool crosshairsNeeded()
 }
 const u32 *getCrosshairTextureData();
 std::pair<float, float> getCrosshairPosition(int playerNum);
-
-#define SAVE_STATES_CAPACITY 10

shell/android-studio/flycast/src/main/jni/src/Android.cpp

@@ -309,7 +309,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_pause(JNIEnv *env,job
         dc_stop();
         game_started = true; // restart when resumed
         if (config::AutoSavestate)
-            dc_savestate();
+            dc_savestate(config::SavestateSlot);
     }
 }
 
@@ -324,7 +324,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_emu_JNIdc_stop(JNIEnv *env,jobj
     if (dc_is_running()) {
         dc_stop();
         if (config::AutoSavestate)
-            dc_savestate();
+            dc_savestate(config::SavestateSlot);
     }
     dc_term_game();
     gui_state = GuiState::Main;