Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* 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:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Minecraft.Client/MinecartRenderer.cpp
View File

@@ -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();