summaryrefslogtreecommitdiff
path: root/src/nodedef.cpp
diff options
context:
space:
mode:
authorkwolekr <kwolekr@minetest.net>2013-04-23 18:39:10 -0400
committerkwolekr <kwolekr@minetest.net>2013-04-23 22:15:51 -0400
commit770305e28dc0ed9aea0eefe041477a46d64eee58 (patch)
tree2306e3f96cdb54848c12f5ee159b12cdb55dcfb2 /src/nodedef.cpp
parent36747794ab981e5d1cc085075979ef981e783b55 (diff)
downloadminetest-770305e28dc0ed9aea0eefe041477a46d64eee58.tar.gz
minetest-770305e28dc0ed9aea0eefe041477a46d64eee58.tar.bz2
minetest-770305e28dc0ed9aea0eefe041477a46d64eee58.zip
Add option to use texture alpha channel
Diffstat (limited to 'src/nodedef.cpp')
-rw-r--r--src/nodedef.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index e2b72333f..e09c1910d 100644
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -658,15 +658,11 @@ public:
break;
}
- u8 material_type = 0;
- if(is_liquid){
- if(f->alpha == 255)
- material_type = TILE_MATERIAL_LIQUID_OPAQUE;
- else
- material_type = TILE_MATERIAL_LIQUID_TRANSPARENT;
- } else{
- material_type = TILE_MATERIAL_BASIC;
- }
+ u8 material_type;
+ if (is_liquid)
+ material_type = (f->alpha == 255) ? TILE_MATERIAL_LIQUID_OPAQUE : TILE_MATERIAL_LIQUID_TRANSPARENT;
+ else
+ material_type = (f->alpha == 255) ? TILE_MATERIAL_BASIC : TILE_MATERIAL_ALPHA;
// Tiles (fill in f->tiles[])
for(u16 j=0; j<6; j++){