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

20
Minecraft.Client/MobRenderer.cpp
View File

@@ -30,7 +30,7 @@ void MobRenderer::renderLeash(shared_ptr<Mob> entity, double x, double y, double
{
shared_ptr<Entity> roper = entity->getLeashHolder();
// roper = entityRenderDispatcher.cameraEntity;
if (roper != NULL)
if (roper != nullptr)
{
glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
@@ -61,9 +61,9 @@ void MobRenderer::renderLeash(shared_ptr<Mob> entity, double x, double y, double
x += rotOffCos;
z += rotOffSin;
double dx = (float) (endX - startX);
double dy = (float) (endY - startY);
double dz = (float) (endZ - startZ);
double dx = static_cast<float>(endX - startX);
double dy = static_cast<float>(endY - startY);
double dz = static_cast<float>(endZ - startZ);
glDisable(GL_TEXTURE_2D);
glDisable(GL_LIGHTING);
@@ -92,9 +92,9 @@ void MobRenderer::renderLeash(shared_ptr<Mob> entity, double x, double y, double
{
tessellator->color(rDarkCol, gDarkCol, bDarkCol, 1.0F);
}
float aa = (float) k / (float) steps;
tessellator->vertex(x + (dx * aa) + 0, y + (dy * ((aa * aa) + aa) * 0.5) + ((((float) steps - (float) k) / (steps * 0.75F)) + 0.125F), z + (dz * aa));
tessellator->vertex(x + (dx * aa) + width, y + (dy * ((aa * aa) + aa) * 0.5) + ((((float) steps - (float) k) / (steps * 0.75F)) + 0.125F) + width, z + (dz * aa));
float aa = static_cast<float>(k) / static_cast<float>(steps);
tessellator->vertex(x + (dx * aa) + 0, y + (dy * ((aa * aa) + aa) * 0.5) + (((static_cast<float>(steps) - static_cast<float>(k)) / (steps * 0.75F)) + 0.125F), z + (dz * aa));
tessellator->vertex(x + (dx * aa) + width, y + (dy * ((aa * aa) + aa) * 0.5) + (((static_cast<float>(steps) - static_cast<float>(k)) / (steps * 0.75F)) + 0.125F) + width, z + (dz * aa));
}
tessellator->end();
@@ -109,9 +109,9 @@ void MobRenderer::renderLeash(shared_ptr<Mob> entity, double x, double y, double
{
tessellator->color(rDarkCol, gDarkCol, bDarkCol, 1.0F);
}
float aa = (float) k / (float) steps;
tessellator->vertex(x + (dx * aa) + 0, y + (dy * ((aa * aa) + aa) * 0.5) + ((((float) steps - (float) k) / (steps * 0.75F)) + 0.125F) + width, z + (dz * aa));
tessellator->vertex(x + (dx * aa) + width, y + (dy * ((aa * aa) + aa) * 0.5) + ((((float) steps - (float) k) / (steps * 0.75F)) + 0.125F), z + (dz * aa) + width);
float aa = static_cast<float>(k) / static_cast<float>(steps);
tessellator->vertex(x + (dx * aa) + 0, y + (dy * ((aa * aa) + aa) * 0.5) + (((static_cast<float>(steps) - static_cast<float>(k)) / (steps * 0.75F)) + 0.125F) + width, z + (dz * aa));
tessellator->vertex(x + (dx * aa) + width, y + (dy * ((aa * aa) + aa) * 0.5) + (((static_cast<float>(steps) - static_cast<float>(k)) / (steps * 0.75F)) + 0.125F), z + (dz * aa) + width);
}
tessellator->end();