summaryrefslogtreecommitdiff
path: root/Source/Android
diff options
context:
space:
mode:
authorjnaidu360 <128784914+jnaidu360@users.noreply.github.com>2023-03-24 20:20:26 -0700
committerjnaidu360 <128784914+jnaidu360@users.noreply.github.com>2023-06-04 18:10:08 -0700
commit66f4902a1e53b60333bf085fcf2e4660f5257a73 (patch)
tree3780b1d0052db2e9403a3138d15c86479d853af5 /Source/Android
parent6743ca8e098268e7a11f26d626a15a09bd342577 (diff)
Improved Skylanders Portal Window Navigation
Adds features to improve navigation of Skylanders portal menu, includes: -List of Skylanders and filters for searching -Improved buttons for faster loading options -Added default user folder for storing .sky files
Diffstat (limited to 'Source/Android')
-rw-r--r--Source/Android/jni/SkylanderConfig.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Android/jni/SkylanderConfig.cpp b/Source/Android/jni/SkylanderConfig.cpp
index 306b574938..76a0718624 100644
--- a/Source/Android/jni/SkylanderConfig.cpp
+++ b/Source/Android/jni/SkylanderConfig.cpp
@@ -26,7 +26,7 @@ Java_org_dolphinemu_dolphinemu_features_skylanders_SkylanderConfig_getSkylanderM
for (const auto& it : IOS::HLE::USB::list_skylanders)
{
- const std::string& name = it.second;
+ const std::string& name = it.second.name;
jobject skylander_obj =
env->NewObject(skylander_class, skylander_init, it.first.first, it.first.second);
env->CallObjectMethod(hash_map_obj, IDCache::GetHashMapPut(), skylander_obj,
@@ -51,7 +51,7 @@ Java_org_dolphinemu_dolphinemu_features_skylanders_SkylanderConfig_getInverseSky
for (const auto& it : IOS::HLE::USB::list_skylanders)
{
- const std::string& name = it.second;
+ const std::string& name = it.second.name;
jobject skylander_obj =
env->NewObject(skylander_class, skylander_init, it.first.first, it.first.second);
env->CallObjectMethod(hash_map_obj, IDCache::GetHashMapPut(), ToJString(env, name),
@@ -104,7 +104,7 @@ Java_org_dolphinemu_dolphinemu_features_skylanders_SkylanderConfig_loadSkylander
if (it != IOS::HLE::USB::list_skylanders.end())
{
- name = it->second;
+ name = it->second.name;
}
return env->NewObject(pair_class, pair_init,
@@ -151,7 +151,7 @@ Java_org_dolphinemu_dolphinemu_features_skylanders_SkylanderConfig_createSkyland
if (it != IOS::HLE::USB::list_skylanders.end())
{
- name = it->second;
+ name = it->second.name;
}
return env->NewObject(pair_class, pair_init,