backups/4jcraft
1
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-14 07:47:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use standard action helper types in common app

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-11 00:53:18 +11:00
parent f7e6b02835
commit d0a741544c
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Minecraft.Client/Platform/Common/Consoles_App.cpp
View file

@ -101,7 +101,7 @@ CMinecraftApp::CMinecraftApp()
{
m_eTMSAction[i]=eTMSAction_Idle;
m_eXuiAction[i]=eAppAction_Idle;
m_eXuiActionParam[i] = NULL;
m_eXuiActionParam[i] = nullptr;
//m_dwAdditionalModelParts[i] = 0;
DebugPrintf("Player at index %d has guest number %d\n", i,m_currentSigninInfo[i].dwGuestNumber );
@ -250,14 +250,14 @@ void CMinecraftApp::DebugPrintf(int user, const char *szFormat, ...)
va_end(ap);
}
LPCWSTR CMinecraftApp::GetString(int iID)
const wchar_t *CMinecraftApp::GetString(int iID)
{
//return L"Değişiklikler ve Yenilikler";
//return L"ÕÕÕÕÖÖÖÖ";
return app.m_stringTable->getString(iID);
}
void CMinecraftApp::SetAction(int iPad, eXuiAction action, LPVOID param)
void CMinecraftApp::SetAction(int iPad, eXuiAction action, void *param)
{
if(m_eXuiAction[iPad] == eAppAction_ExitWorldCapturedThumbnail && action != eAppAction_Idle)
{
@ -733,7 +733,7 @@ int CMinecraftApp::DefaultOptionsCallback(LPVOID pParam,C_4JProfile::PROFILESETT
// flag the default options to be set
pApp->DebugPrintf("Setting default options for player %d", iPad);
pApp->SetAction(iPad,eAppAction_SetDefaultOptions, (LPVOID)pSettings);
pApp->SetAction(iPad,eAppAction_SetDefaultOptions, pSettings);
//pApp->SetDefaultOptions(pSettings,iPad);
// if the profile data has been changed, then force a profile write
@ -2369,7 +2369,7 @@ int CMinecraftApp::DisplaySavingMessage(void *pParam, C4JStorage::ESavingMessage
return 0;
}
void CMinecraftApp::SetActionConfirmed(LPVOID param)
void CMinecraftApp::SetActionConfirmed(void *param)
{
XuiActionParam *actionInfo = (XuiActionParam *)param;
app.SetAction(actionInfo->iPad, actionInfo->action);
@ -2380,7 +2380,7 @@ void CMinecraftApp::HandleXuiActions(void)
{
eXuiAction eAction;
eTMSAction eTMS;
LPVOID param;
void *param;
Minecraft *pMinecraft=Minecraft::GetInstance();
std::shared_ptr<MultiplayerLocalPlayer> player;

14
Minecraft.Client/Platform/Common/Consoles_App.h
View file

@ -148,7 +148,7 @@ public:
void SetSpecialTutorialCompletionFlag(int iPad, int index);
static LPCWSTR GetString(int iID);
static const wchar_t * GetString(int iID);
eGameMode GetGameMode() { return m_eGameMode;}
void SetGameMode(eGameMode eMode) { m_eGameMode=eMode;}
@ -156,12 +156,12 @@ public:
eXuiAction GetGlobalXuiAction() {return m_eGlobalXuiAction;}
void SetGlobalXuiAction(eXuiAction action) {m_eGlobalXuiAction=action;}
eXuiAction GetXuiAction(int iPad) {return m_eXuiAction[iPad];}
void SetAction(int iPad, eXuiAction action, LPVOID param = NULL);
void SetAction(int iPad, eXuiAction action, void *param = nullptr);
void SetTMSAction(int iPad, eTMSAction action) {m_eTMSAction[iPad]=action; }
eTMSAction GetTMSAction(int iPad) {return m_eTMSAction[iPad];}
eXuiServerAction GetXuiServerAction(int iPad) {return m_eXuiServerAction[iPad];}
LPVOID GetXuiServerActionParam(int iPad) {return m_eXuiServerActionParam[iPad];}
void SetXuiServerAction(int iPad, eXuiServerAction action, LPVOID param = NULL) {m_eXuiServerAction[iPad]=action; m_eXuiServerActionParam[iPad] = param;}
void * GetXuiServerActionParam(int iPad) {return m_eXuiServerActionParam[iPad];}
void SetXuiServerAction(int iPad, eXuiServerAction action, void *param = nullptr) {m_eXuiServerAction[iPad]=action; m_eXuiServerActionParam[iPad] = param;}
eXuiServerAction GetGlobalXuiServerAction() {return m_eGlobalXuiServerAction;}
void SetGlobalXuiServerAction(eXuiServerAction action) {m_eGlobalXuiServerAction=action;}
@ -176,7 +176,7 @@ public:
// 4J Stu - Added so that we can call this when a confirmation box is selected
static void SetActionConfirmed(LPVOID param);
static void SetActionConfirmed(void *param);
void HandleXuiActions(void);
// 4J Stu - Functions used for Minecon and other promo work
@ -505,10 +505,10 @@ private:
// we'll action these at the end of the game loop
eXuiAction m_eXuiAction[XUSER_MAX_COUNT];
eTMSAction m_eTMSAction[XUSER_MAX_COUNT];
LPVOID m_eXuiActionParam[XUSER_MAX_COUNT];
void *m_eXuiActionParam[XUSER_MAX_COUNT];
eXuiAction m_eGlobalXuiAction;
eXuiServerAction m_eXuiServerAction[XUSER_MAX_COUNT];
LPVOID m_eXuiServerActionParam[XUSER_MAX_COUNT];
void *m_eXuiServerActionParam[XUSER_MAX_COUNT];
eXuiServerAction m_eGlobalXuiServerAction;
bool m_bLiveLinkRequired;