mirror of
https://github.com/smartcmd/MinecraftConsoles.git
synced 2026-05-16 16:03:52 +00:00
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
parent
a9be52c41a
commit
087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
|
|
@ -12,8 +12,8 @@
|
|||
//----------------------------------------------------------------------------------
|
||||
HRESULT CScene_HelpAndOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled )
|
||||
{
|
||||
m_iPad = *static_cast<int *>(pInitData->pvInitData);
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
|
||||
m_iPad = *(int *)pInitData->pvInitData;
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
|
||||
|
||||
MapChildControls();
|
||||
XuiControlSetText(m_Buttons[BUTTON_HAO_CHANGESKIN],app.GetString(IDS_CHANGE_SKIN));
|
||||
|
|
@ -140,7 +140,7 @@ HRESULT CScene_HelpAndOptions::OnInit( XUIMessageInit* pInitData, BOOL& bHandled
|
|||
|
||||
/*HRESULT CScene_HelpAndOptions::OnTMSDLCFileRetrieved( )
|
||||
{
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
|
||||
m_Timer.SetShow(FALSE);
|
||||
m_bIgnoreInput=false;
|
||||
|
||||
|
|
@ -253,7 +253,7 @@ HRESULT CScene_HelpAndOptions::OnControlNavigate(XUIMessageControlNavigate *pCon
|
|||
{
|
||||
pControlNavigateData->hObjDest=XuiControlGetNavigation(pControlNavigateData->hObjSource,pControlNavigateData->nControlNavigate,TRUE,TRUE);
|
||||
|
||||
if(pControlNavigateData->hObjDest!=nullptr)
|
||||
if(pControlNavigateData->hObjDest!=NULL)
|
||||
{
|
||||
bHandled=TRUE;
|
||||
}
|
||||
|
|
@ -344,7 +344,7 @@ HRESULT CScene_HelpAndOptions::OnKeyDown(XUIMessageInput* pInputData, BOOL& rfHa
|
|||
|
||||
HRESULT CScene_HelpAndOptions::OnNavReturn(HXUIOBJ hObj,BOOL& rfHandled)
|
||||
{
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==nullptr);
|
||||
bool bNotInGame=(Minecraft::GetInstance()->level==NULL);
|
||||
|
||||
if(bNotInGame)
|
||||
{
|
||||
|
|
@ -414,7 +414,7 @@ HRESULT CScene_HelpAndOptions::OnTransitionStart( XUIMessageTransition *pTransit
|
|||
|
||||
// 4J-PB - Going to resize buttons if the text is too big to fit on any of them (Br-pt problem with the length of Unlock Full Game)
|
||||
XUIRect xuiRect;
|
||||
HXUIOBJ visual=nullptr;
|
||||
HXUIOBJ visual=NULL;
|
||||
HXUIOBJ text;
|
||||
float fMaxTextLen=0.0f;
|
||||
float fTextVisualLen;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue