Merge pull request #12251 from Dentomologist/skylanderportal_make_pro…

…tected_variables_private SkylanderPortal: Make protected variables private
dolphin-emu · Oct 28, 2023 · 6bac012 · 6bac012
2 parents 3454bc4 + 3ba5cd3
commit 6bac012
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylander.h b/Source/Core/Core/IOS/USB/Emulated/Skylander.h
@@ -145,7 +145,10 @@ class SkylanderPortal final
   u8 LoadSkylander(u8* buf, File::IOFile in_file);
   std::pair<u16, u16> CalculateIDs(const std::array<u8, 0x40 * 0x10>& file_data);
 
-protected:
+private:
+  static bool IsSkylanderNumberValid(u8 sky_num);
+  static bool IsBlockNumberValid(u8 block);
+
   std::mutex sky_mutex;
 
   bool m_activated = true;
@@ -156,10 +159,6 @@ class SkylanderPortal final
   SkylanderLEDColor m_color_trap = {};
 
   std::array<Skylander, MAX_SKYLANDERS> skylanders;
-
-private:
-  static bool IsSkylanderNumberValid(u8 sky_num);
-  static bool IsBlockNumberValid(u8 block);
 };
 
 }  // namespace IOS::HLE::USB