piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 21:30:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11694 from jnaidu360/skylanders-portal-window

Browse Source 
Skylanders Portal Menu Navigational Improvements
This commit is contained in:
Admiral H. Curtiss
2023-06-06 19:20:39 +02:00
committed by GitHub
parent 5d40871dd4 66f4902a1e
commit a7678f3210
8 changed files with 1284 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Android/jni/SkylanderConfig.cpp
View File

@ -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,