Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
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:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Minecraft.Client/Common/XUI/XUI_Ctrl_EnchantmentBook.cpp
View File

@@ -30,12 +30,12 @@ CXuiCtrlEnchantmentBook::CXuiCtrlEnchantmentBook() :
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;
model = nullptr;
model = NULL;
time = 0;
flip = oFlip = flipT = flipA = 0.0f;
@@ -44,7 +44,7 @@ CXuiCtrlEnchantmentBook::CXuiCtrlEnchantmentBook() :
CXuiCtrlEnchantmentBook::~CXuiCtrlEnchantmentBook()
{
//if(model != nullptr) delete model;
//if(model != NULL) delete model;
}
//-----------------------------------------------------------------------------
@@ -60,13 +60,13 @@ HRESULT CXuiCtrlEnchantmentBook::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<CXuiSceneEnchant *>(pObj);
m_containerScene = (CXuiSceneEnchant *)pObj;
last = nullptr;
@@ -166,12 +166,12 @@ HRESULT CXuiCtrlEnchantmentBook::OnRender(XUIMessageRender *pRenderData, BOOL &b
glEnable(GL_CULL_FACE);
if(model == nullptr)
if(model == NULL)
{
// Share the model the the EnchantTableRenderer
EnchantTableRenderer *etr = (EnchantTableRenderer*)TileEntityRenderDispatcher::instance->getRenderer(eTYPE_ENCHANTMENTTABLEENTITY);
if(etr != nullptr)
if(etr != NULL)
{
model = etr->bookModel;
}
@@ -181,7 +181,7 @@ HRESULT CXuiCtrlEnchantmentBook::OnRender(XUIMessageRender *pRenderData, BOOL &b
}
}
model->render(nullptr, 0, ff1, ff2, o, 0, 1 / 16.0f,true);
model->render(NULL, 0, ff1, ff2, o, 0, 1 / 16.0f,true);
glDisable(GL_CULL_FACE);
glPopMatrix();
@@ -281,7 +281,7 @@ HRESULT CXuiCtrlEnchantmentBook::OnRender(XUIMessageRender *pRenderData, BOOL &b
//
// glEnable(GL_RESCALE_NORMAL);
//
// model.render(nullptr, 0, ff1, ff2, o, 0, 1 / 16.0f,true);
// model.render(NULL, 0, ff1, ff2, o, 0, 1 / 16.0f,true);
//
// glDisable(GL_RESCALE_NORMAL);
// Lighting::turnOff();