mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-09-12 20:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

add Saveslot enum

Browse source
This commit is contained in:
Felix Nüsse 2025-08-09 16:22:19 +02:00
commit 891587ee3c
2 changed files with 30 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.kt
View file

@ -2,7 +2,6 @@
package org.dolphinemu.dolphinemu.activities package org.dolphinemu.dolphinemu.activities
import android.annotation.SuppressLint
import android.content.DialogInterface import android.content.DialogInterface
import android.content.Intent import android.content.Intent
import android.graphics.Rect 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.MenuFragment
import org.dolphinemu.dolphinemu.fragments.SaveLoadStateFragment import org.dolphinemu.dolphinemu.fragments.SaveLoadStateFragment
import org.dolphinemu.dolphinemu.fragments.SaveLoadStateFragment.SaveOrLoad import org.dolphinemu.dolphinemu.fragments.SaveLoadStateFragment.SaveOrLoad
import org.dolphinemu.dolphinemu.model.SAVESLOT.*
import org.dolphinemu.dolphinemu.overlay.InputOverlay import org.dolphinemu.dolphinemu.overlay.InputOverlay
import org.dolphinemu.dolphinemu.overlay.InputOverlayPointer import org.dolphinemu.dolphinemu.overlay.InputOverlayPointer
import org.dolphinemu.dolphinemu.ui.main.MainPresenter import org.dolphinemu.dolphinemu.ui.main.MainPresenter
@ -466,22 +466,22 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
} }
MENU_ACTION_TAKE_SCREENSHOT -> NativeLibrary.SaveScreenShot() MENU_ACTION_TAKE_SCREENSHOT -> NativeLibrary.SaveScreenShot()
MENU_ACTION_QUICK_SAVE -> NativeLibrary.SaveState(9, false) MENU_ACTION_QUICK_SAVE -> NativeLibrary.SaveState(QUICKSAVE.slot, false)
MENU_ACTION_QUICK_LOAD -> NativeLibrary.LoadState(9) MENU_ACTION_QUICK_LOAD -> NativeLibrary.LoadState(QUICKSAVE.slot)
MENU_ACTION_SAVE_ROOT -> showSubMenu(SaveOrLoad.SAVE) MENU_ACTION_SAVE_ROOT -> showSubMenu(SaveOrLoad.SAVE)
MENU_ACTION_LOAD_ROOT -> showSubMenu(SaveOrLoad.LOAD) MENU_ACTION_LOAD_ROOT -> showSubMenu(SaveOrLoad.LOAD)
MENU_ACTION_SAVE_SLOT1 -> NativeLibrary.SaveState(0, false) MENU_ACTION_SAVE_SLOT1 -> NativeLibrary.SaveState(SLOT1.slot, false)
MENU_ACTION_SAVE_SLOT2 -> NativeLibrary.SaveState(1, false) MENU_ACTION_SAVE_SLOT2 -> NativeLibrary.SaveState(SLOT2.slot, false)
MENU_ACTION_SAVE_SLOT3 -> NativeLibrary.SaveState(2, false) MENU_ACTION_SAVE_SLOT3 -> NativeLibrary.SaveState(SLOT3.slot, false)
MENU_ACTION_SAVE_SLOT4 -> NativeLibrary.SaveState(3, false) MENU_ACTION_SAVE_SLOT4 -> NativeLibrary.SaveState(SLOT4.slot, false)
MENU_ACTION_SAVE_SLOT5 -> NativeLibrary.SaveState(4, false) MENU_ACTION_SAVE_SLOT5 -> NativeLibrary.SaveState(SLOT5.slot, false)
MENU_ACTION_SAVE_SLOT6 -> NativeLibrary.SaveState(5, false) MENU_ACTION_SAVE_SLOT6 -> NativeLibrary.SaveState(SLOT6.slot, false)
MENU_ACTION_LOAD_SLOT1 -> NativeLibrary.LoadState(0) MENU_ACTION_LOAD_SLOT1 -> NativeLibrary.LoadState(SLOT1.slot)
MENU_ACTION_LOAD_SLOT2 -> NativeLibrary.LoadState(1) MENU_ACTION_LOAD_SLOT2 -> NativeLibrary.LoadState(SLOT2.slot)
MENU_ACTION_LOAD_SLOT3 -> NativeLibrary.LoadState(2) MENU_ACTION_LOAD_SLOT3 -> NativeLibrary.LoadState(SLOT3.slot)
MENU_ACTION_LOAD_SLOT4 -> NativeLibrary.LoadState(3) MENU_ACTION_LOAD_SLOT4 -> NativeLibrary.LoadState(SLOT4.slot)
MENU_ACTION_LOAD_SLOT5 -> NativeLibrary.LoadState(4) MENU_ACTION_LOAD_SLOT5 -> NativeLibrary.LoadState(SLOT5.slot)
MENU_ACTION_LOAD_SLOT6 -> NativeLibrary.LoadState(5) MENU_ACTION_LOAD_SLOT6 -> NativeLibrary.LoadState(SLOT6.slot)
MENU_ACTION_CHANGE_DISC -> { MENU_ACTION_CHANGE_DISC -> {
val intent = Intent(Intent.ACTION_OPEN_DOCUMENT) val intent = Intent(Intent.ACTION_OPEN_DOCUMENT)
intent.addCategory(Intent.CATEGORY_OPENABLE) intent.addCategory(Intent.CATEGORY_OPENABLE)
@ -1173,7 +1173,7 @@ class EmulationActivity : AppCompatActivity(), ThemeProvider {
fun saveOnExit() { fun saveOnExit() {
if (BooleanSetting.MAIN_EXIT_SAVE_AND_LOAD.boolean) { if (BooleanSetting.MAIN_EXIT_SAVE_AND_LOAD.boolean) {
Log.error("[EmulationActivity] Exitsave on Pause") 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) Thread.sleep(10)
} }
Log.error("[EmulationActivity] Load Exitsave on start") Log.error("[EmulationActivity] Load Exitsave on start")
val creationTime = NativeLibrary.GetUnixTimeOfStateSlot(9) val creationTime = NativeLibrary.GetUnixTimeOfStateSlot(EXITSAVE.slot)
if (creationTime != 0L) { if (creationTime != 0L) {
NativeLibrary.LoadState(9) NativeLibrary.LoadState(EXITSAVE.slot)
} else { } else {
Log.error("[EmulationActivity] Exitsave-Slot not available") Log.error("[EmulationActivity] Exitsave-Slot not available")
} }

12
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/model/SAVESLOT.kt Normal file
View file

@ -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)
}