Merge branch 'smartcmd:main' into main

1 files changed, 8 insertions, 8 deletions

diff --git a/Minecraft.Client/ModelPart.cpp b/Minecraft.Client/ModelPart.cpp
index c59a821c..e423a4ae 100644
--- a/Minecraft.Client/ModelPart.cpp
+++ b/Minecraft.Client/ModelPart.cpp
@@ -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;
 }