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,15 +16,15 @@ void MobSpawnerRenderer::render(shared_ptr<TileEntity> _spawner, double x, doubl
|
||||
void MobSpawnerRenderer::render(BaseMobSpawner *spawner, double x, double y, double z, float a)
|
||||
{
|
||||
glPushMatrix();
|
||||
glTranslatef((float) x + 0.5f, (float) y, (float) z + 0.5f);
|
||||
glTranslatef(static_cast<float>(x) + 0.5f, static_cast<float>(y), static_cast<float>(z) + 0.5f);
|
||||
|
||||
shared_ptr<Entity> e = spawner->getDisplayEntity();
|
||||
if (e != NULL)
|
||||
if (e != nullptr)
|
||||
{
|
||||
e->setLevel(spawner->getLevel());
|
||||
float s = 7 / 16.0f;
|
||||
glTranslatef(0, 0.4f, 0);
|
||||
glRotatef((float) (spawner->oSpin + (spawner->spin - spawner->oSpin) * a) * 10, 0, 1, 0);
|
||||
glRotatef(static_cast<float>(spawner->oSpin + (spawner->spin - spawner->oSpin) * a) * 10, 0, 1, 0);
|
||||
glRotatef(-30, 1, 0, 0);
|
||||
glTranslatef(0, -0.4f, 0);
|
||||
glScalef(s, s, s);
|
||||
|
||||
Reference in New Issue
Block a user