aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/MinecartRenderer.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.Client/MinecartRenderer.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* 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 * Add safety checks and fix a issue with vector going OOR
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 34205d33..0ecb7f58 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 != NULL)
+ if (p != nullptr)
{
Vec3 *p0 = cart->getPosOffs(xx, yy, zz, r);
Vec3 *p1 = cart->getPosOffs(xx, yy, zz, -r);
- if (p0 == NULL) p0 = p;
- if (p1 == NULL) p1 = p;
+ if (p0 == nullptr) p0 = p;
+ if (p1 == nullptr) 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 = (float) (atan2(dir->z, dir->x) * 180 / PI);
- xRot = (float) (atan(dir->y) * 73);
+ rot = static_cast<float>(atan2(dir->z, dir->x) * 180 / PI);
+ xRot = static_cast<float>(atan(dir->y) * 73);
}
}
- glTranslatef((float) x, (float) y, (float) z);
+ glTranslatef(static_cast<float>(x), static_cast<float>(y), static_cast<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 != NULL)
+ if (tile != nullptr)
{
glPushMatrix();