The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-25 07:21:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12251 from Dentomologist/skylanderportal_make_protected_variables_private

Browse Source 
SkylanderPortal: Make protected variables private
This commit is contained in:
Tilka 2023-10-28 02:09:28 +01:00 committed by GitHub
commit 6bac012001
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/Core/Core/IOS/USB/Emulated/Skylander.h
View File

@ -145,7 +145,10 @@ public:
u8 LoadSkylander(u8* buf, File::IOFile in_file); u8 LoadSkylander(u8* buf, File::IOFile in_file);
std::pair<u16, u16> CalculateIDs(const std::array<u8, 0x40 * 0x10>& file_data); 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; std::mutex sky_mutex;
bool m_activated = true; bool m_activated = true;
@ -156,10 +159,6 @@ protected:
SkylanderLEDColor m_color_trap = {}; SkylanderLEDColor m_color_trap = {};
std::array<Skylander, MAX_SKYLANDERS> skylanders; std::array<Skylander, MAX_SKYLANDERS> skylanders;
private:
static bool IsSkylanderNumberValid(u8 sky_num);
static bool IsBlockNumberValid(u8 block);
}; };
} // namespace IOS::HLE::USB } // namespace IOS::HLE::USB