backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-20 09:57:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: remove backwards-compat enum aliases from PlatformTypes
Some checks are pending
Build (Linux, x86-64) / build-linux (push) Waiting to run
Details
Format Check / clang-format (push) Waiting to run
Details

Browse source
This commit is contained in:
MatthewBeshay 2026-04-02 16:30:19 +11:00
parent 26222f26e0
commit eacf5ccf30
4 changed files with 3 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
targets/minecraft/client/player/LocalPlayer.cpp
View file

@ -850,7 +850,7 @@ void LocalPlayer::awardStat(Stat* stat, const std::vector<uint8_t>& param) {
if (g_NetworkManager.IsLocalGame() && if (g_NetworkManager.IsLocalGame() &&
g_NetworkManager.GetPlayerCount() == 1 && g_NetworkManager.GetPlayerCount() == 1 &&
ProfileManager.GetAwardType(ach->getAchievementID()) != ProfileManager.GetAwardType(ach->getAchievementID()) !=
eAwardType_Achievement) { EAwardType::Achievement) {
ui.CloseUIScenes(m_iPad); ui.CloseUIScenes(m_iPad);
ui.NavigateToScene(m_iPad, eUIScene_PauseMenu); ui.NavigateToScene(m_iPad, eUIScene_PauseMenu);
} }

12
targets/platform/PlatformTypes.h
View file

@ -55,18 +55,6 @@ enum class EAwardType {
AvatarItem, AvatarItem,
}; };
// Backwards-compatible aliases for call sites still using the old
// unscoped names. Remove these as call sites are migrated.
inline constexpr auto EKeyboard_Pending = EKeyboardResult::Pending;
inline constexpr auto EKeyboard_Cancelled = EKeyboardResult::Cancelled;
inline constexpr auto EKeyboard_ResultAccept = EKeyboardResult::ResultAccept;
inline constexpr auto EKeyboard_ResultDecline = EKeyboardResult::ResultDecline;
inline constexpr auto eAwardType_Achievement = EAwardType::Achievement;
inline constexpr auto eAwardType_GamerPic = EAwardType::GamerPic;
inline constexpr auto eAwardType_Theme = EAwardType::Theme;
inline constexpr auto eAwardType_AvatarItem = EAwardType::AvatarItem;
inline constexpr int XUSER_INDEX_ANY = 255; inline constexpr int XUSER_INDEX_ANY = 255;
inline constexpr int XUSER_MAX_COUNT = 4; inline constexpr int XUSER_MAX_COUNT = 4;
inline constexpr int XUSER_NAME_SIZE = 32; inline constexpr int XUSER_NAME_SIZE = 32;

2
targets/platform/sdl2/Input.cpp
View file

@ -656,7 +656,7 @@ EKeyboardResult C_4JInput::RequestKeyboard(const wchar_t*, const wchar_t*, int,
s_keyboardCallback = callback; s_keyboardCallback = callback;
s_keyboardCallbackParam = scene; s_keyboardCallbackParam = scene;
SDL_StartTextInput(); SDL_StartTextInput();
return EKeyboard_Pending; return EKeyboardResult::Pending;
} }
bool C_4JInput::GetMenuDisplayed(int iPad) { bool C_4JInput::GetMenuDisplayed(int iPad) {
if (iPad >= 0 && iPad < 4) return s_menuDisplayed[iPad]; if (iPad >= 0 && iPad < 4) return s_menuDisplayed[iPad];

2
targets/platform/sdl2/Profile.h
View file

@ -112,7 +112,7 @@ public:
CXuiStringTable* = nullptr, int = -1, int = -1, int = -1, CXuiStringTable* = nullptr, int = -1, int = -1, int = -1,
char* = nullptr, unsigned int = 0L) {} char* = nullptr, unsigned int = 0L) {}
int GetAwardId(int) { return 0; } int GetAwardId(int) { return 0; }
EAwardType GetAwardType(int) { return eAwardType_Achievement; } EAwardType GetAwardType(int) { return EAwardType::Achievement; }
bool CanBeAwarded(int, int) { return false; } bool CanBeAwarded(int, int) { return false; }
void Award(int, int, bool = false) {} void Award(int, int, bool = false) {}
bool IsAwardsFlagSet(int, int) { return false; } bool IsAwardsFlagSet(int, int) { return false; }