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

Skylanders Portal Menu Navigational Improvements
dolphin-emu · Jun 6, 2023 · a7678f3 · a7678f3
2 parents 5d40871 + 66f4902
commit a7678f3
Show file tree

Hide file tree

Showing 8 changed files with 1,268 additions and 631 deletions.
diff --git 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,

diff --git a/Source/Core/Common/FileUtil.h b/Source/Core/Common/FileUtil.h
@@ -33,6 +33,8 @@ enum
   D_CONFIG_IDX,           // global settings
   D_GAMESETTINGS_IDX,     // user-specified settings which override both the global and the default
                           // settings (per game)
+  D_SKYLANDERS_IDX,
+
   D_MAPS_IDX,
   D_CACHE_IDX,
   D_COVERCACHE_IDX,

diff --git a/Source/Core/Core/Config/MainSettings.cpp b/Source/Core/Core/Config/MainSettings.cpp
@@ -297,6 +297,8 @@ const Info<std::string> MAIN_WIRELESS_MAC{{System::Main, "General", "WirelessMac
 const Info<std::string> MAIN_GDB_SOCKET{{System::Main, "General", "GDBSocket"}, ""};
 const Info<int> MAIN_GDB_PORT{{System::Main, "General", "GDBPort"}, -1};
 const Info<int> MAIN_ISO_PATH_COUNT{{System::Main, "General", "ISOPaths"}, 0};
+const Info<std::string> MAIN_SKYLANDERS_PATH{{System::Main, "General", "SkylandersCollectionPath"},
+                                             ""};
 
 static Info<std::string> MakeISOPathConfigInfo(size_t idx)
 {

diff --git a/Source/Core/Core/Config/MainSettings.h b/Source/Core/Core/Config/MainSettings.h
@@ -196,6 +196,7 @@ extern const Info<std::string> MAIN_WIRELESS_MAC;
 extern const Info<std::string> MAIN_GDB_SOCKET;
 extern const Info<int> MAIN_GDB_PORT;
 extern const Info<int> MAIN_ISO_PATH_COUNT;
+extern const Info<std::string> MAIN_SKYLANDERS_PATH;
 std::vector<std::string> GetIsoPaths();
 void SetIsoPaths(const std::vector<std::string>& paths);