Merge branch 'smartcmd:main' into main

1 files changed, 7 insertions, 7 deletions

diff --git a/Minecraft.World/ChunkPos.cpp b/Minecraft.World/ChunkPos.cpp
index ff1c34f0..6d37a446 100644
--- a/Minecraft.World/ChunkPos.cpp
+++ b/Minecraft.World/ChunkPos.cpp
@@ -6,18 +6,18 @@ ChunkPos::ChunkPos(int x, int z) : x( x ), z( z )
 {
 }
 
-__int64 ChunkPos::hashCode(int x, int z)
+int64_t ChunkPos::hashCode(int x, int z)
 {
-	__int64 xx = x;
-	__int64 zz = z;
+	int64_t xx = x;
+	int64_t zz = z;
 	return (xx & 0xffffffffl) | ((zz & 0xffffffffl) << 32l);
 }
 
 int ChunkPos::hashCode()
 {
-	__int64 hash = hashCode(x, z);
-	int h1 = (int) (hash);
-	int h2 = (int) (hash >> 32l);
+	int64_t hash = hashCode(x, z);
+	const int h1 = static_cast<int>(hash);
+	const int h2 = static_cast<int>(hash >> 32l);
 	return h1 ^ h2;
 }
 
@@ -63,7 +63,7 @@ wstring ChunkPos::toString()
     return L"[" + std::to_wstring(x) + L", " + std::to_wstring(z) + L"]";
 }
 
-__int64 ChunkPos::hash_fnct(const ChunkPos &k)
+int64_t ChunkPos::hash_fnct(const ChunkPos &k)
 {
 	return k.hashCode(k.x,k.z);
 }