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:
@@ -16,9 +16,9 @@ void TheEndPortalRenderer::render(shared_ptr<TileEntity> _table, double x, doubl
|
||||
{
|
||||
// 4J Convert as we aren't using a templated class
|
||||
shared_ptr<TheEndPortalTileEntity> table = dynamic_pointer_cast<TheEndPortalTileEntity>(_table);
|
||||
float xx = (float) tileEntityRenderDispatcher->xPlayer;
|
||||
float yy = (float) tileEntityRenderDispatcher->yPlayer;
|
||||
float zz = (float) tileEntityRenderDispatcher->zPlayer;
|
||||
float xx = static_cast<float>(tileEntityRenderDispatcher->xPlayer);
|
||||
float yy = static_cast<float>(tileEntityRenderDispatcher->yPlayer);
|
||||
float zz = static_cast<float>(tileEntityRenderDispatcher->zPlayer);
|
||||
|
||||
glDisable(GL_LIGHTING);
|
||||
|
||||
@@ -50,12 +50,12 @@ void TheEndPortalRenderer::render(shared_ptr<TileEntity> _table, double x, doubl
|
||||
sscale = 1 / 2.0f;
|
||||
}
|
||||
|
||||
float dd = (float) -(y + hoff);
|
||||
float dd = static_cast<float>(-(y + hoff));
|
||||
{
|
||||
float ss1 = (float) (dd + Camera::yPlayerOffs);
|
||||
float ss2 = (float) (dd + dist + Camera::yPlayerOffs);
|
||||
float s = ss1 / ss2;
|
||||
s = (float) (y + hoff) + s;
|
||||
s = static_cast<float>(y + hoff) + s;
|
||||
|
||||
glTranslatef(xx, s, zz);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user