aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/MinecartRenderer.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.Client/MinecartRenderer.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
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 a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.Client/MinecartRenderer.cpp')
-rw-r--r--Minecraft.Client/MinecartRenderer.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.Client/MinecartRenderer.cpp b/Minecraft.Client/MinecartRenderer.cpp
index 0ecb7f58..34205d33 100644
--- a/Minecraft.Client/MinecartRenderer.cpp
+++ b/Minecraft.Client/MinecartRenderer.cpp
@@ -42,12 +42,12 @@ void MinecartRenderer::render(shared_ptr<Entity> _cart, double x, double y, doub
float xRot = cart->xRotO + (cart->xRot - cart->xRotO) * a;
- if (p != nullptr)
+ if (p != NULL)
{
Vec3 *p0 = cart->getPosOffs(xx, yy, zz, r);
Vec3 *p1 = cart->getPosOffs(xx, yy, zz, -r);
- if (p0 == nullptr) p0 = p;
- if (p1 == nullptr) p1 = p;
+ if (p0 == NULL) p0 = p;
+ if (p1 == NULL) p1 = p;
x += p->x - xx;
y += (p0->y + p1->y) / 2 - yy;
@@ -60,11 +60,11 @@ void MinecartRenderer::render(shared_ptr<Entity> _cart, double x, double y, doub
else
{
dir = dir->normalize();
- rot = static_cast<float>(atan2(dir->z, dir->x) * 180 / PI);
- xRot = static_cast<float>(atan(dir->y) * 73);
+ rot = (float) (atan2(dir->z, dir->x) * 180 / PI);
+ xRot = (float) (atan(dir->y) * 73);
}
}
- glTranslatef(static_cast<float>(x), static_cast<float>(y), static_cast<float>(z));
+ glTranslatef((float) x, (float) y, (float) z);
glRotatef(180 - rot, 0, 1, 0);
glRotatef(-xRot, 0, 0, 1);
@@ -80,7 +80,7 @@ void MinecartRenderer::render(shared_ptr<Entity> _cart, double x, double y, doub
Tile *tile = cart->getDisplayTile();
int tileData = cart->getDisplayData();
- if (tile != nullptr)
+ if (tile != NULL)
{
glPushMatrix();