Merge branch 'smartcmd:main' into main

1 files changed, 21 insertions, 21 deletions

diff --git a/Minecraft.World/Color.cpp b/Minecraft.World/Color.cpp
index 256e9017..554ee379 100644
--- a/Minecraft.World/Color.cpp
+++ b/Minecraft.World/Color.cpp
@@ -18,7 +18,7 @@ Color::Color( float r, float g, float b)
 	assert( b >= 0.0f && b <= 1.0f );
 
 	//argb
-	colour = ( (0xFF<<24) | ( (int)(r*255)<<16 ) | ( (int)(g*255)<<8 ) | ( (int)(b*255) ) );
+	colour = ( (0xFF<<24) | ( static_cast<int>(r * 255)<<16 ) | ( static_cast<int>(g * 255)<<8 ) | static_cast<int>(b * 255) );
 }
 
 Color::Color( int r, int g, int b)
@@ -43,7 +43,7 @@ Color Color::getHSBColor(float hue, float saturation, float brightness)
 	int r = 0, g = 0, b = 0;
     if (saturation == 0)
 	{
-	    r = g = b = (int) (brightness * 255.0f + 0.5f);
+	    r = g = b = static_cast<int>(brightness * 255.0f + 0.5f);
 	}
 	else
 	{
@@ -52,37 +52,37 @@ Color Color::getHSBColor(float hue, float saturation, float brightness)
 	    float p = brightness * (1.0f - saturation);
 	    float q = brightness * (1.0f - saturation * f);
 	    float t = brightness * (1.0f - (saturation * (1.0f - f)));
-	    switch ((int) h)
+	    switch (static_cast<int>(h))
 		{
 			case 0:
-				r = (int) (brightness * 255.0f + 0.5f);
-				g = (int) (t * 255.0f + 0.5f);
-				b = (int) (p * 255.0f + 0.5f);
+				r = static_cast<int>(brightness * 255.0f + 0.5f);
+				g = static_cast<int>(t * 255.0f + 0.5f);
+				b = static_cast<int>(p * 255.0f + 0.5f);
 			break;
 			case 1:
-				r = (int) (q * 255.0f + 0.5f);
-				g = (int) (brightness * 255.0f + 0.5f);
-				b = (int) (p * 255.0f + 0.5f);
+				r = static_cast<int>(q * 255.0f + 0.5f);
+				g = static_cast<int>(brightness * 255.0f + 0.5f);
+				b = static_cast<int>(p * 255.0f + 0.5f);
 			break;
 			case 2:
-				r = (int) (p * 255.0f + 0.5f);
-				g = (int) (brightness * 255.0f + 0.5f);
-				b = (int) (t * 255.0f + 0.5f);
+				r = static_cast<int>(p * 255.0f + 0.5f);
+				g = static_cast<int>(brightness * 255.0f + 0.5f);
+				b = static_cast<int>(t * 255.0f + 0.5f);
 			break;
 			case 3:
-				r = (int) (p * 255.0f + 0.5f);
-				g = (int) (q * 255.0f + 0.5f);
-				b = (int) (brightness * 255.0f + 0.5f);
+				r = static_cast<int>(p * 255.0f + 0.5f);
+				g = static_cast<int>(q * 255.0f + 0.5f);
+				b = static_cast<int>(brightness * 255.0f + 0.5f);
 			break;
 			case 4:
-				r = (int) (t * 255.0f + 0.5f);
-				g = (int) (p * 255.0f + 0.5f);
-				b = (int) (brightness * 255.0f + 0.5f);
+				r = static_cast<int>(t * 255.0f + 0.5f);
+				g = static_cast<int>(p * 255.0f + 0.5f);
+				b = static_cast<int>(brightness * 255.0f + 0.5f);
 			break;
 			case 5:
-				r = (int) (brightness * 255.0f + 0.5f);
-				g = (int) (p * 255.0f + 0.5f);
-				b = (int) (q * 255.0f + 0.5f);
+				r = static_cast<int>(brightness * 255.0f + 0.5f);
+				g = static_cast<int>(p * 255.0f + 0.5f);
+				b = static_cast<int>(q * 255.0f + 0.5f);
 			break;
 	    }
 	}