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:
@@ -22,10 +22,10 @@ CXuiCtrlMinecraftPlayer::CXuiCtrlMinecraftPlayer() :
|
||||
Minecraft *pMinecraft=Minecraft::GetInstance();
|
||||
|
||||
ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
|
||||
m_fScreenWidth=static_cast<float>(pMinecraft->width_phys);
|
||||
m_fRawWidth=static_cast<float>(ssc.rawWidth);
|
||||
m_fScreenHeight=static_cast<float>(pMinecraft->height_phys);
|
||||
m_fRawHeight=static_cast<float>(ssc.rawHeight);
|
||||
m_fScreenWidth=(float)pMinecraft->width_phys;
|
||||
m_fRawWidth=(float)ssc.rawWidth;
|
||||
m_fScreenHeight=(float)pMinecraft->height_phys;
|
||||
m_fRawHeight=(float)ssc.rawHeight;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -41,13 +41,13 @@ HRESULT CXuiCtrlMinecraftPlayer::OnInit(XUIMessageInit* pInitData, BOOL& rfHandl
|
||||
{
|
||||
XuiElementGetParent(parent,&parent);
|
||||
currentClass = XuiGetObjectClass( parent );
|
||||
} while (parent != nullptr && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
|
||||
} while (parent != NULL && !XuiClassDerivesFrom( currentClass, hcInventoryClass ) );
|
||||
|
||||
assert( parent != nullptr );
|
||||
assert( parent != NULL );
|
||||
|
||||
VOID *pObj;
|
||||
XuiObjectFromHandle( parent, &pObj );
|
||||
m_containerScene = static_cast<CXuiSceneInventory *>(pObj);
|
||||
m_containerScene = (CXuiSceneInventory *)pObj;
|
||||
|
||||
m_iPad = m_containerScene->getPad();
|
||||
|
||||
@@ -116,7 +116,7 @@ HRESULT CXuiCtrlMinecraftPlayer::OnRender(XUIMessageRender *pRenderData, BOOL &b
|
||||
//
|
||||
// for(int i=0;i<XUSER_MAX_COUNT;i++)
|
||||
// {
|
||||
// if(pMinecraft->localplayers[i] != nullptr)
|
||||
// if(pMinecraft->localplayers[i] != NULL)
|
||||
// {
|
||||
// iPlayerC++;
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user