Remove no virtual dtor warnings, make MapgenParams contain actual NoiseParams

[minetest.git] / src / nodedef.cpp

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index ca889890781128a34da81eb0dc0a8a05dc159bc9..ba3e42e980a36e9901183533c3d2f1aff6db11d5 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -593,7 +593,7 @@ class CNodeDefManager: public IWritableNodeDefManager
                        {
                                tiledef[j] = f->tiledef[j];
                                if(tiledef[j].name == "")
-                                       tiledef[j].name = "unknown_block.png";
+                                       tiledef[j].name = "unknown_node.png";
                        }
 
                        bool is_liquid = false;
@@ -628,6 +628,10 @@ class CNodeDefManager: public IWritableNodeDefManager
                                f->solidness = 0;
                                f->visual_solidness = 1;
                                break;
+                       case NDT_GLASSLIKE_FRAMED:
+                               f->solidness = 0;
+                               f->visual_solidness = 1;
+                               break;
                        case NDT_ALLFACES:
                                f->solidness = 0;
                                f->visual_solidness = 1;
@@ -658,15 +662,11 @@ class CNodeDefManager: public IWritableNodeDefManager
                                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++){