From 210f651807847c290ab7ba14c64f9eff1c47284e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Tue, 24 Jul 2018 20:00:16 +0200
Subject: World: factor out Section handling to a generic interface

---
 src/World/Block.hpp | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/World/Block.hpp')

diff --git a/src/World/Block.hpp b/src/World/Block.hpp
index 4975faa..e2dcfde 100644
--- a/src/World/Block.hpp
+++ b/src/World/Block.hpp
@@ -26,28 +26,25 @@
 
 #pragma once
 
-#include <cstdint>
+#include "../NBT/CompoundTag.hpp"
+#include "../Resource/BlockType.hpp"
 
 
 namespace MinedMap {
 namespace World {
 
 struct Block {
-	uint8_t id;
-	uint8_t data;
-
+	const Resource::BlockType *type;
 	unsigned height;
-
 	uint8_t blockLight;
-	uint8_t skyLight;
-
 	uint8_t biome;
 
-	Block() : id(0), data(0), height(0), blockLight(0), skyLight(0), biome(0) {}
-	Block(uint8_t id0, uint8_t data0, unsigned height0, uint8_t blockLight0, uint8_t skyLight0, uint8_t biome0)
-		: id(id0), data(data0), height(height0), blockLight(blockLight0), skyLight(skyLight0), biome(biome0) {}
 
 	uint32_t getColor() const;
+
+	operator bool() const {
+		return type;
+	}
 };
 
 }
-- 
cgit v1.2.3