From 5badb9bccae803009bde182bf69ee0d02a36b22c Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Mon, 20 Nov 2017 12:13:11 +0100 Subject: cChunkInterface GetBlock, GetBlockMeta, GetBlockTypeMeta use vectors (#4050) --- src/ChunkDef.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/ChunkDef.h') diff --git a/src/ChunkDef.h b/src/ChunkDef.h index f4a0867b5..188ad33d8 100644 --- a/src/ChunkDef.h +++ b/src/ChunkDef.h @@ -116,15 +116,14 @@ public: inline static Vector3i AbsoluteToRelative(Vector3i a_BlockPosition) { - int ChunkX, ChunkZ; - BlockToChunk(a_BlockPosition.x, a_BlockPosition.z, ChunkX, ChunkZ); + cChunkCoords ChunckPos = BlockToChunk(a_BlockPosition); - return {a_BlockPosition.x - ChunkX * Width, a_BlockPosition.y, a_BlockPosition.z - ChunkZ * Width}; + return {a_BlockPosition.x - ChunckPos.m_ChunkX * Width, a_BlockPosition.y, a_BlockPosition.z - ChunckPos.m_ChunkZ * Width}; } - inline static Vector3i AbsoluteToRelative(Vector3i a_BlockPosition, int a_ChunkX, int a_ChunkZ) + inline static Vector3i AbsoluteToRelative(Vector3i a_BlockPosition, cChunkCoords a_ChunkPos) { - return {a_BlockPosition.x - a_ChunkX * Width, a_BlockPosition.y, a_BlockPosition.z - a_ChunkZ * Width}; + return {a_BlockPosition.x - a_ChunkPos.m_ChunkX * Width, a_BlockPosition.y, a_BlockPosition.z - a_ChunkPos.m_ChunkZ * Width}; } /** Converts relative block coordinates into absolute coordinates with a known chunk location */ -- cgit v1.2.3