Clocksource: use a better clock if available.

[minetest.git] / src / nodedef.cpp

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index b5ccc3b94e94521a0a2912bab773c68c684644b5..e30cf6f12f92f0e2d4df2772eb25c1de61dce6b3 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -139,7 +139,7 @@ void TileDef::serialize(std::ostream &os, u16 protocol_version) const
        }
 }
 
-void TileDef::deSerialize(std::istream &is)
+void TileDef::deSerialize(std::istream &is, bool culling_ignore)
 {
        int version = readU8(is);
        name = deSerializeString(is);
@@ -153,6 +153,11 @@ void TileDef::deSerialize(std::istream &is)
                tileable_horizontal = readU8(is);
                tileable_vertical = readU8(is);
        }
+       // when connecting to old servers - do not use
+       // provided values here since culling needs to be
+       // disabled by default for these drawtypes
+       if (culling_ignore)
+               backface_culling = false;
 }
 
 
@@ -233,6 +238,7 @@ void ContentFeatures::reset()
        diggable = true;
        climbable = false;
        buildable_to = false;
+       floodable = false;
        rightclickable = true;
        leveled = 0;
        liquid_type = LIQUID_NONE;
@@ -318,6 +324,7 @@ void ContentFeatures::serialize(std::ostream &os, u16 protocol_version) const
        // the protocol version
        os<<serializeString(mesh);
        collision_box.serialize(os, protocol_version);
+       writeU8(os, floodable);
 }
 
 void ContentFeatures::deSerialize(std::istream &is)
@@ -337,15 +344,22 @@ void ContentFeatures::deSerialize(std::istream &is)
                groups[name] = value;
        }
        drawtype = (enum NodeDrawType)readU8(is);
+
+       bool ignore_culling = ((version <= 26) &&
+                       ((drawtype == NDT_MESH) ||
+                        (drawtype == NDT_PLANTLIKE) ||
+                        (drawtype == NDT_FIRELIKE) ||
+                        (drawtype == NDT_LIQUID)));
+
        visual_scale = readF1000(is);
        if(readU8(is) != 6)
                throw SerializationError("unsupported tile count");
        for(u32 i = 0; i < 6; i++)
-               tiledef[i].deSerialize(is);
+               tiledef[i].deSerialize(is, ignore_culling);
        if(readU8(is) != CF_SPECIAL_COUNT)
                throw SerializationError("unsupported CF_SPECIAL_COUNT");
        for(u32 i = 0; i < CF_SPECIAL_COUNT; i++)
-               tiledef_special[i].deSerialize(is);
+               tiledef_special[i].deSerialize(is, ignore_culling);
        alpha = readU8(is);
        post_effect_color.setAlpha(readU8(is));
        post_effect_color.setRed(readU8(is));
@@ -388,6 +402,7 @@ void ContentFeatures::deSerialize(std::istream &is)
                // otherwise changes the protocol version
        mesh = deSerializeString(is);
        collision_box.deSerialize(is);
+       floodable = readU8(is);
        }catch(SerializationError &e) {};
 }
 
@@ -520,6 +535,7 @@ void CNodeDefManager::clear()
                f.pointable           = false;
                f.diggable            = false;
                f.buildable_to        = true;
+               f.floodable           = true;
                f.is_ground_content   = true;
                // Insert directly into containers
                content_t c = CONTENT_AIR;
@@ -839,12 +855,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef,
                        assert(f->liquid_type == LIQUID_SOURCE);
                        if (opaque_water)
                                f->alpha = 255;
-                       if (new_style_water){
-                               f->solidness = 0;
-                       } else {
-                               f->solidness = 1;
-                               f->backface_culling = false;
-                       }
+                       f->solidness = new_style_water ? 0 : 1;
                        is_liquid = true;
                        break;
                case NDT_FLOWINGLIQUID:
@@ -895,17 +906,14 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef,
                        break;
                case NDT_PLANTLIKE:
                        f->solidness = 0;
-                       f->backface_culling = false;
                        if (f->waving == 1)
                                material_type = TILE_MATERIAL_WAVING_PLANTS;
                        break;
                case NDT_FIRELIKE:
-                       f->backface_culling = false;
                        f->solidness = 0;
                        break;
                case NDT_MESH:
                        f->solidness = 0;
-                       f->backface_culling = false;
                        break;
                case NDT_TORCHLIKE:
                case NDT_SIGNLIKE:
@@ -937,7 +945,7 @@ void CNodeDefManager::updateTextures(IGameDef *gamedef,
                // Tiles (fill in f->tiles[])
                for (u16 j = 0; j < 6; j++) {
                        fillTileAttribs(tsrc, &f->tiles[j], &tiledef[j], tile_shader[j],
-                               use_normal_texture, f->backface_culling, f->alpha, material_type);
+                               use_normal_texture, f->tiledef[j].backface_culling, f->alpha, material_type);
                }
 
                // Special tiles (fill in f->special_tiles[])
@@ -1262,7 +1270,6 @@ void ContentFeatures::serializeOld(std::ostream &os, u16 protocol_version) const
                        "Unsupported version requested");
 }
 
-
 void ContentFeatures::deSerializeOld(std::istream &is, int version)
 {
        if (version == 5) // In PROTOCOL_VERSION 13
@@ -1276,15 +1283,22 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
                        groups[name] = value;
                }
                drawtype = (enum NodeDrawType)readU8(is);
+
+               bool ignore_culling = ((version <= 26) &&
+                               ((drawtype == NDT_MESH) ||
+                               (drawtype == NDT_PLANTLIKE) ||
+                               (drawtype == NDT_FIRELIKE) ||
+                               (drawtype == NDT_LIQUID)));
+
                visual_scale = readF1000(is);
                if (readU8(is) != 6)
                        throw SerializationError("unsupported tile count");
                for (u32 i = 0; i < 6; i++)
-                       tiledef[i].deSerialize(is);
+                       tiledef[i].deSerialize(is, ignore_culling);
                if (readU8(is) != CF_SPECIAL_COUNT)
                        throw SerializationError("unsupported CF_SPECIAL_COUNT");
                for (u32 i = 0; i < CF_SPECIAL_COUNT; i++)
-                       tiledef_special[i].deSerialize(is);
+                       tiledef_special[i].deSerialize(is, ignore_culling);
                alpha = readU8(is);
                post_effect_color.setAlpha(readU8(is));
                post_effect_color.setRed(readU8(is));
@@ -1328,12 +1342,12 @@ void ContentFeatures::deSerializeOld(std::istream &is, int version)
                if (readU8(is) != 6)
                        throw SerializationError("unsupported tile count");
                for (u32 i = 0; i < 6; i++)
-                       tiledef[i].deSerialize(is);
+                       tiledef[i].deSerialize(is, drawtype);
                // CF_SPECIAL_COUNT in version 6 = 2
                if (readU8(is) != 2)
                        throw SerializationError("unsupported CF_SPECIAL_COUNT");
                for (u32 i = 0; i < 2; i++)
-                       tiledef_special[i].deSerialize(is);
+                       tiledef_special[i].deSerialize(is, drawtype);
                alpha = readU8(is);
                post_effect_color.setAlpha(readU8(is));
                post_effect_color.setRed(readU8(is));