diff options
| author | Tilka <tilkax@gmail.com> | 2024-06-30 16:04:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-30 16:04:20 +0100 |
| commit | 7f0ee9dddde4f4d769bbc21592bf8fca0dba6e86 (patch) | |
| tree | 9f5cd680af0850cab3bb77d22066acad2debbe35 /Source/Android | |
| parent | c19187f0c7e93b1ac35e6c3aeef93da1b0a63443 (diff) | |
| parent | cfcdaab51471ff1a3ef519b84efcde2a1f7f08a2 (diff) | |
Merge pull request #12894 from deReeperJosh/infinity-base-numbers
IOS/USB: Use Enum for Infinity Base Positions
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/jni/InfinityConfig.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Source/Android/jni/InfinityConfig.cpp b/Source/Android/jni/InfinityConfig.cpp index 7be0402769..a5740537b0 100644 --- a/Source/Android/jni/InfinityConfig.cpp +++ b/Source/Android/jni/InfinityConfig.cpp @@ -10,6 +10,8 @@ #include "Core/IOS/USB/Emulated/Infinity.h" #include "Core/System.h" +using FigureUIPosition = IOS::HLE::USB::FigureUIPosition; + extern "C" { JNIEXPORT jobject JNICALL @@ -66,7 +68,7 @@ Java_org_dolphinemu_dolphinemu_features_infinitybase_InfinityConfig_removeFigure jint position) { auto& system = Core::System::GetInstance(); - system.GetInfinityBase().RemoveFigure(position); + system.GetInfinityBase().RemoveFigure(static_cast<FigureUIPosition>(position)); } JNIEXPORT jstring JNICALL @@ -87,9 +89,10 @@ Java_org_dolphinemu_dolphinemu_features_infinitybase_InfinityConfig_loadFigure(J } auto& system = Core::System::GetInstance(); - system.GetInfinityBase().RemoveFigure(position); + system.GetInfinityBase().RemoveFigure(static_cast<FigureUIPosition>(position)); return ToJString(env, - system.GetInfinityBase().LoadFigure(file_data, std::move(inf_file), position)); + system.GetInfinityBase().LoadFigure(file_data, std::move(inf_file), + static_cast<FigureUIPosition>(position))); } JNIEXPORT jstring JNICALL @@ -102,7 +105,7 @@ Java_org_dolphinemu_dolphinemu_features_infinitybase_InfinityConfig_createFigure auto& system = Core::System::GetInstance(); system.GetInfinityBase().CreateFigure(file_name, fig_num); - system.GetInfinityBase().RemoveFigure(position); + system.GetInfinityBase().RemoveFigure(static_cast<FigureUIPosition>(position)); File::IOFile inf_file(file_name, "r+b"); if (!inf_file) @@ -116,6 +119,7 @@ Java_org_dolphinemu_dolphinemu_features_infinitybase_InfinityConfig_createFigure } return ToJString(env, - system.GetInfinityBase().LoadFigure(file_data, std::move(inf_file), position)); + system.GetInfinityBase().LoadFigure(file_data, std::move(inf_file), + static_cast<FigureUIPosition>(position))); } } |