From 891587ee3c95380611a2f2d908068ecf3de883d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Felix=20N=C3=BCsse?= Date: Sat, 9 Aug 2025 16:22:19 +0200 Subject: [PATCH] add Saveslot enum --- .../activities/EmulationActivity.kt | 36 +++++++++---------- .../dolphinemu/dolphinemu/model/SAVESLOT.kt | 12 +++++++ 2 files changed, 30 insertions(+), 18 deletions(-) create mode 100644 Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/SAVESLOT.kt diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt index 40f11b8f0f..47d92815bf 100644 --- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt @@ -2,7 +2,6 @@ package org.dolphinemu.dolphinemu.activities -import android.annotation.SuppressLint import android.content.DialogInterface import android.content.Intent import android.graphics.Rect @@ -53,6 +52,7 @@ import org.dolphinemu.dolphinemu.fragments.EmulationFragment import org.dolphinemu.dolphinemu.fragments.MenuFragment import org.dolphinemu.dolphinemu.fragments.SaveLoadStateFragment import org.dolphinemu.dolphinemu.fragments.SaveLoadStateFragment.SaveOrLoad +import org.dolphinemu.dolphinemu.model.SAVESLOT.* import org.dolphinemu.dolphinemu.overlay.InputOverlay import org.dolphinemu.dolphinemu.overlay.InputOverlayPointer import org.dolphinemu.dolphinemu.ui.main.MainPresenter @@ -466,22 +466,22 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider { } MENU_ACTION_TAKE_SCREENSHOT -> NativeLibrary.SaveScreenShot() - MENU_ACTION_QUICK_SAVE -> NativeLibrary.SaveState(9, false) - MENU_ACTION_QUICK_LOAD -> NativeLibrary.LoadState(9) + MENU_ACTION_QUICK_SAVE -> NativeLibrary.SaveState(QUICKSAVE.slot, false) + MENU_ACTION_QUICK_LOAD -> NativeLibrary.LoadState(QUICKSAVE.slot) MENU_ACTION_SAVE_ROOT -> showSubMenu(SaveOrLoad.SAVE) MENU_ACTION_LOAD_ROOT -> showSubMenu(SaveOrLoad.LOAD) - MENU_ACTION_SAVE_SLOT1 -> NativeLibrary.SaveState(0, false) - MENU_ACTION_SAVE_SLOT2 -> NativeLibrary.SaveState(1, false) - MENU_ACTION_SAVE_SLOT3 -> NativeLibrary.SaveState(2, false) - MENU_ACTION_SAVE_SLOT4 -> NativeLibrary.SaveState(3, false) - MENU_ACTION_SAVE_SLOT5 -> NativeLibrary.SaveState(4, false) - MENU_ACTION_SAVE_SLOT6 -> NativeLibrary.SaveState(5, false) - MENU_ACTION_LOAD_SLOT1 -> NativeLibrary.LoadState(0) - MENU_ACTION_LOAD_SLOT2 -> NativeLibrary.LoadState(1) - MENU_ACTION_LOAD_SLOT3 -> NativeLibrary.LoadState(2) - MENU_ACTION_LOAD_SLOT4 -> NativeLibrary.LoadState(3) - MENU_ACTION_LOAD_SLOT5 -> NativeLibrary.LoadState(4) - MENU_ACTION_LOAD_SLOT6 -> NativeLibrary.LoadState(5) + MENU_ACTION_SAVE_SLOT1 -> NativeLibrary.SaveState(SLOT1.slot, false) + MENU_ACTION_SAVE_SLOT2 -> NativeLibrary.SaveState(SLOT2.slot, false) + MENU_ACTION_SAVE_SLOT3 -> NativeLibrary.SaveState(SLOT3.slot, false) + MENU_ACTION_SAVE_SLOT4 -> NativeLibrary.SaveState(SLOT4.slot, false) + MENU_ACTION_SAVE_SLOT5 -> NativeLibrary.SaveState(SLOT5.slot, false) + MENU_ACTION_SAVE_SLOT6 -> NativeLibrary.SaveState(SLOT6.slot, false) + MENU_ACTION_LOAD_SLOT1 -> NativeLibrary.LoadState(SLOT1.slot) + MENU_ACTION_LOAD_SLOT2 -> NativeLibrary.LoadState(SLOT2.slot) + MENU_ACTION_LOAD_SLOT3 -> NativeLibrary.LoadState(SLOT3.slot) + MENU_ACTION_LOAD_SLOT4 -> NativeLibrary.LoadState(SLOT4.slot) + MENU_ACTION_LOAD_SLOT5 -> NativeLibrary.LoadState(SLOT5.slot) + MENU_ACTION_LOAD_SLOT6 -> NativeLibrary.LoadState(SLOT6.slot) MENU_ACTION_CHANGE_DISC -> { val intent = Intent(Intent.ACTION_OPEN_DOCUMENT) intent.addCategory(Intent.CATEGORY_OPENABLE) @@ -1173,7 +1173,7 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider { fun saveOnExit() { if (BooleanSetting.MAIN_EXIT_SAVE_AND_LOAD.boolean) { Log.error("[EmulationActivity] Exitsave on Pause") - NativeLibrary.SaveState(10, true) + NativeLibrary.SaveState(EXITSAVE.slot, true) } } @@ -1183,9 +1183,9 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider { Thread.sleep(10) } Log.error("[EmulationActivity] Load Exitsave on start") - val creationTime = NativeLibrary.GetUnixTimeOfStateSlot(9) + val creationTime = NativeLibrary.GetUnixTimeOfStateSlot(EXITSAVE.slot) if (creationTime != 0L) { - NativeLibrary.LoadState(9) + NativeLibrary.LoadState(EXITSAVE.slot) } else { Log.error("[EmulationActivity] Exitsave-Slot not available") } diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/SAVESLOT.kt b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/SAVESLOT.kt new file mode 100644 index 0000000000..988a0906e4 --- /dev/null +++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/SAVESLOT.kt @@ -0,0 +1,12 @@ +package org.dolphinemu.dolphinemu.model + +enum class SAVESLOT(val slot: Int) { + SLOT1(0), + SLOT2(1), + SLOT3(2), + SLOT4(3), + SLOT5(4), + SLOT6(5), + QUICKSAVE(9), + EXITSAVE(10) +} \ No newline at end of file