Project modernization (#630)
* Fixed boats falling and a TP glitch #266 * Replaced every C-style cast with C++ ones * Replaced every C-style cast with C++ ones * Fixed boats falling and a TP glitch #266 * Updated NULL to nullptr and fixing some type issues * Modernized and fixed a few bugs - Replaced most instances of `NULL` with `nullptr`. - Replaced most `shared_ptr(new ...)` with `make_shared`. - Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances. * Fixing more conflicts * Replace int loops with size_t and start work on overrides
This commit is contained in:
@@ -19,10 +19,10 @@ UIControl_MinecraftPlayer::UIControl_MinecraftPlayer()
|
||||
Minecraft *pMinecraft=Minecraft::GetInstance();
|
||||
|
||||
ScreenSizeCalculator ssc(pMinecraft->options, pMinecraft->width_phys, pMinecraft->height_phys);
|
||||
m_fScreenWidth=(float)pMinecraft->width_phys;
|
||||
m_fRawWidth=(float)ssc.rawWidth;
|
||||
m_fScreenHeight=(float)pMinecraft->height_phys;
|
||||
m_fRawHeight=(float)ssc.rawHeight;
|
||||
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);
|
||||
}
|
||||
|
||||
void UIControl_MinecraftPlayer::render(IggyCustomDrawCallbackRegion *region)
|
||||
@@ -49,7 +49,7 @@ void UIControl_MinecraftPlayer::render(IggyCustomDrawCallbackRegion *region)
|
||||
glScalef(-ss, ss, ss);
|
||||
glRotatef(180, 0, 0, 1);
|
||||
|
||||
UIScene_InventoryMenu *containerMenu = (UIScene_InventoryMenu *)m_parentScene;
|
||||
UIScene_InventoryMenu *containerMenu = static_cast<UIScene_InventoryMenu *>(m_parentScene);
|
||||
|
||||
float oybr = pMinecraft->localplayers[containerMenu->getPad()]->yBodyRot;
|
||||
float oyr = pMinecraft->localplayers[containerMenu->getPad()]->yRot;
|
||||
|
||||
Reference in New Issue
Block a user