From 63942793f0ac047e2efb6389792c457d98af794f Mon Sep 17 00:00:00 2001
From: UnknownShadow200 <unknownshadow200@gmail.com>
Date: Wed, 10 May 2017 13:38:35 +1000
Subject: [PATCH] Use macro for indexing coordinates

---
 src/Client/World.c | 22 ++++++++++------------
 src/Client/World.h | 10 ++++++++++
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/Client/World.c b/src/Client/World.c
index 57d7500de..fc3b83439 100644
--- a/src/Client/World.c
+++ b/src/Client/World.c
@@ -31,34 +31,34 @@ BlockID World_GetPhysicsBlock(Int32 x, Int32 y, Int32 z) {
 	if (x < 0 || x >= World_Width || z < 0 || z >= World_Length || y < 0) return BlockID_Bedrock;
 	if (y >= World_Height) return BlockID_Air;
 
-	return World_Blocks[(y * World_Length + z) * World_Width + x];
+	return World_Blocks[World_Pack(x, y, z)];
 }
 
 
 void World_SetBlock(Int32 x, Int32 y, Int32 z, BlockID blockId) {
-	World_Blocks[(y * World_Length + z) * World_Width + x] = blockId;
+	World_Blocks[World_Pack(x, y, z)] = blockId;
 }
 
 void World_SetBlock_3I(Vector3I p, BlockID blockId) {
-	World_Blocks[(p.Y * World_Length + p.Z) * World_Width + p.X] = blockId;
+	World_Blocks[World_Pack(p.X, p.Y, p.Z)] = blockId;
 }
 
 BlockID World_GetBlock(Int32 x, Int32 y, Int32 z) {
-	return World_Blocks[(y * World_Length + z) * World_Width + x];
+	return World_Blocks[World_Pack(x, y, z)];
 }
 
 BlockID World_GetBlock_3I(Vector3I p) {
-	return World_Blocks[(p.Y * World_Length + p.Z) * World_Width + p.X];
+	return World_Blocks[World_Pack(p.X, p.Y, p.Z)];
 }
 
 BlockID World_SafeGetBlock(Int32 x, Int32 y, Int32 z) {
-	return World_IsValidPos(x, y, z) ?
-		World_Blocks[(y * World_Length + z) * World_Width + x] : BlockID_Air;
+	return World_IsValidPos(x, y, z) ? 
+		World_Blocks[World_Pack(x, y, z)] : BlockID_Air;
 }
 
 BlockID World_SafeGetBlock_3I(Vector3I p) {
-	return World_IsValidPos(p.X, p.Y, p.Z) ?
-		World_Blocks[(p.Y * World_Length + p.Z) * World_Width + p.X] : BlockID_Air;
+	return World_IsValidPos(p.X, p.Y, p.Z) ? 
+		World_Blocks[World_Pack(p.X, p.Y, p.Z)] : BlockID_Air;
 }
 
 
@@ -77,8 +77,6 @@ Vector3I World_GetCoords(Int32 index) {
 		return Vector3I_Create1(-1);
 
 	Vector3I v;
-	v.X = index % World_Width;
-	v.Y = index / (World_Width * World_Length);
-	v.Z = (index / World_Width) % World_Length;
+	World_Unpack(index, v.X, v.Y, v.Z);
 	return v;
 }
\ No newline at end of file
diff --git a/src/Client/World.h b/src/Client/World.h
index e5dfdc5af..d482b4798 100644
--- a/src/Client/World.h
+++ b/src/Client/World.h
@@ -8,6 +8,16 @@
 */
 
 
+/* Converts a single integer index into coordinates. */
+#define World_Unpack(index, x, y, z)\
+x = index % World_Width;\
+z = (index / World_Width) % World_Length;\
+y = (index / World_Width) / World_Length;
+
+/* Packs a coordinate into a single integer index. */
+#define World_Pack(x, y, z) ((y * World_Length + z) * World_Width + x)
+
+
 /* Raw blocks of this world. */
 BlockID* World_Blocks = NULL;