summaryrefslogtreecommitdiffstats
path: root/src/World/Block.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/World/Block.cpp')
-rw-r--r--src/World/Block.cpp10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/World/Block.cpp b/src/World/Block.cpp
index 3c295d4..c47e2bc 100644
--- a/src/World/Block.cpp
+++ b/src/World/Block.cpp
@@ -33,16 +33,14 @@ namespace MinedMap {
namespace World {
uint32_t Block::getColor() const {
- const Resource::BlockType &t = Resource::BLOCK_TYPES[id];
+ const Resource::BlockType &t = Resource::BLOCK_TYPES[id][data];
if (!t.opaque)
return 0;
- uint32_t color = t.colors[data];
-
- unsigned r = uint8_t(color >> 16);
- unsigned g = uint8_t(color >> 8);
- unsigned b = uint8_t(color);
+ unsigned r = uint8_t(t.color >> 16);
+ unsigned g = uint8_t(t.color >> 8);
+ unsigned b = uint8_t(t.color);
float heightCoef = height/255.0f + 0.5f;