diff options
| author | Tilka <tilkax@gmail.com> | 2023-10-28 02:09:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-28 02:09:28 +0100 |
| commit | 6bac012001aebc9488e46e70422bede60bfa83ac (patch) | |
| tree | 1f4284f7ddde1c61645e5ed2ff67b095f0e78f44 | |
| parent | 3454bc4c3cb74decba5839ad48bc0f6b164a6d98 (diff) | |
| parent | 3ba5cd30ffa8019f988d7ff67032eb2f73c12053 (diff) | |
Merge pull request #12251 from Dentomologist/skylanderportal_make_protected_variables_private
SkylanderPortal: Make protected variables private
| -rw-r--r-- | Source/Core/Core/IOS/USB/Emulated/Skylander.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Source/Core/Core/IOS/USB/Emulated/Skylander.h b/Source/Core/Core/IOS/USB/Emulated/Skylander.h index d21f30d478..357370356e 100644 --- a/Source/Core/Core/IOS/USB/Emulated/Skylander.h +++ b/Source/Core/Core/IOS/USB/Emulated/Skylander.h @@ -145,7 +145,10 @@ public: 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 @@ protected: 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 |