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

16
Minecraft.Client/ModelPart.cpp
View File

@@ -65,7 +65,7 @@ void ModelPart::construct(Model *model, int xTexOffs, int yTexOffs)
void ModelPart::addChild(ModelPart *child)
{
//if (children == NULL) children = new ModelPartArray;
//if (children == nullptr) children = new ModelPartArray;
children.push_back(child);
}
@@ -89,7 +89,7 @@ ModelPart * ModelPart::retrieveChild(SKIN_BOX *pBox)
}
}
return NULL;
return nullptr;
}
ModelPart *ModelPart::mirror()
@@ -139,7 +139,7 @@ void ModelPart::addBox(float x0, float y0, float z0, int w, int h, int d, float
void ModelPart::addTexBox(float x0, float y0, float z0, int w, int h, int d, int tex)
{
cubes.push_back(new Cube(this, xTexOffs, yTexOffs, x0, y0, z0, w, h, d, (float)tex));
cubes.push_back(new Cube(this, xTexOffs, yTexOffs, x0, y0, z0, w, h, d, static_cast<float>(tex)));
}
void ModelPart::setPos(float x, float y, float z)
@@ -180,7 +180,7 @@ void ModelPart::render(float scale, bool usecompiled, bool bHideParentBodyPart)
}
}
}
//if (children != NULL)
//if (children != nullptr)
{
for (unsigned int i = 0; i < children.size(); i++)
{
@@ -208,7 +208,7 @@ void ModelPart::render(float scale, bool usecompiled, bool bHideParentBodyPart)
}
}
}
//if (children != NULL)
//if (children != nullptr)
{
for (unsigned int i = 0; i < children.size(); i++)
{
@@ -234,7 +234,7 @@ void ModelPart::render(float scale, bool usecompiled, bool bHideParentBodyPart)
}
}
}
//if (children != NULL)
//if (children != nullptr)
{
for (unsigned int i = 0; i < children.size(); i++)
{
@@ -307,8 +307,8 @@ void ModelPart::compile(float scale)
ModelPart *ModelPart::setTexSize(int xs, int ys)
{
this->xTexSize = (float)xs;
this->yTexSize = (float)ys;
this->xTexSize = static_cast<float>(xs);
this->yTexSize = static_cast<float>(ys);
return this;
}