diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2023-06-06 19:20:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-06 19:20:39 +0200 |
| commit | a7678f3210c3ddce40a52d7da8510c7ab293ea09 (patch) | |
| tree | 5d8e4415b4667a7fa6c148790a8ed5d625596df3 /Source/Android | |
| parent | 5d40871dd458ccb289beabeb35a2eff4c4c5625e (diff) | |
| parent | 66f4902a1e53b60333bf085fcf2e4660f5257a73 (diff) | |
Merge pull request #11694 from jnaidu360/skylanders-portal-window
Skylanders Portal Menu Navigational Improvements
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/jni/SkylanderConfig.cpp | 8 |
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, |