Tune caves

[oweals/minetest.git] / src / nodedef.cpp

diff --git a/src/nodedef.cpp b/src/nodedef.cpp
index e9abc323b123586bb4cf783175a63a7348e1d35d..4b0c4b28844f4d16043b091997823898ea032103 100644 (file)
--- a/src/nodedef.cpp
+++ b/src/nodedef.cpp
@@ -78,6 +78,22 @@ void MaterialSpec::deSerialize(std::istream &is)
        backface_culling = readU8(is);
 }
 
+/*
+       SimpleSoundSpec serialization
+*/
+
+static void serializeSimpleSoundSpec(const SimpleSoundSpec &ss,
+               std::ostream &os)
+{
+       os<<serializeString(ss.name);
+       writeF1000(os, ss.gain);
+}
+static void deSerializeSimpleSoundSpec(SimpleSoundSpec &ss, std::istream &is)
+{
+       ss.name = deSerializeString(is);
+       ss.gain = readF1000(is);
+}
+
 /*
        ContentFeatures
 */
@@ -109,6 +125,8 @@ void ContentFeatures::reset()
        */
        name = "";
        groups.clear();
+       // Unknown nodes can be dug
+       groups["dig_immediate"] = 2;
        drawtype = NDT_NORMAL;
        visual_scale = 1.0;
        for(u32 i=0; i<6; i++)
@@ -137,11 +155,14 @@ void ContentFeatures::reset()
        selection_box = NodeBox();
        legacy_facedir_simple = false;
        legacy_wallmounted = false;
+       sound_footstep = SimpleSoundSpec();
+       sound_dig = SimpleSoundSpec("__group");
+       sound_dug = SimpleSoundSpec();
 }
 
 void ContentFeatures::serialize(std::ostream &os)
 {
-       writeU8(os, 2); // version
+       writeU8(os, 3); // version
        os<<serializeString(name);
        writeU16(os, groups.size());
        for(ItemGroupList::const_iterator
@@ -183,12 +204,15 @@ void ContentFeatures::serialize(std::ostream &os)
        selection_box.serialize(os);
        writeU8(os, legacy_facedir_simple);
        writeU8(os, legacy_wallmounted);
+       serializeSimpleSoundSpec(sound_footstep, os);
+       serializeSimpleSoundSpec(sound_dig, os);
+       serializeSimpleSoundSpec(sound_dug, os);
 }
 
 void ContentFeatures::deSerialize(std::istream &is)
 {
        int version = readU8(is);
-       if(version != 2)
+       if(version != 3)
                throw SerializationError("unsupported ContentFeatures version");
        name = deSerializeString(is);
        groups.clear();
@@ -234,6 +258,13 @@ void ContentFeatures::deSerialize(std::istream &is)
        selection_box.deSerialize(is);
        legacy_facedir_simple = readU8(is);
        legacy_wallmounted = readU8(is);
+       // If you add anything here, insert it primarily inside the try-catch
+       // block to not need to increase the version.
+       try{
+               deSerializeSimpleSoundSpec(sound_footstep, is);
+               deSerializeSimpleSoundSpec(sound_dig, is);
+               deSerializeSimpleSoundSpec(sound_dug, is);
+       }catch(SerializationError &e) {};
 }
 
 /*
@@ -537,8 +568,9 @@ public:
        }
        void serialize(std::ostream &os)
        {
+               writeU8(os, 1); // version
                u16 count = 0;
-               std::ostringstream tmp_os(std::ios::binary);
+               std::ostringstream os2(std::ios::binary);
                for(u16 i=0; i<=MAX_CONTENT; i++)
                {
                        if(i == CONTENT_IGNORE || i == CONTENT_AIR)
@@ -546,20 +578,27 @@ public:
                        ContentFeatures *f = &m_content_features[i];
                        if(f->name == "")
                                continue;
-                       writeU16(tmp_os, i);
-                       f->serialize(tmp_os);
+                       writeU16(os2, i);
+                       // Wrap it in a string to allow different lengths without
+                       // strict version incompatibilities
+                       std::ostringstream wrapper_os(std::ios::binary);
+                       f->serialize(wrapper_os);
+                       os2<<serializeString(wrapper_os.str());
                        count++;
                }
                writeU16(os, count);
-               os<<serializeLongString(tmp_os.str());
+               os<<serializeLongString(os2.str());
        }
        void deSerialize(std::istream &is)
        {
                clear();
+               int version = readU8(is);
+               if(version != 1)
+                       throw SerializationError("unsupported NodeDefinitionManager version");
                u16 count = readU16(is);
-               std::istringstream tmp_is(deSerializeLongString(is), std::ios::binary);
+               std::istringstream is2(deSerializeLongString(is), std::ios::binary);
                for(u16 n=0; n<count; n++){
-                       u16 i = readU16(tmp_is);
+                       u16 i = readU16(is2);
                        if(i > MAX_CONTENT){
                                errorstream<<"ContentFeatures::deSerialize(): "
                                                <<"Too large content id: "<<i<<std::endl;
@@ -569,7 +608,10 @@ public:
                        if(i == CONTENT_IGNORE || i == CONTENT_AIR)
                                continue;*/
                        ContentFeatures *f = &m_content_features[i];
-                       f->deSerialize(tmp_is);
+                       // Read it from the string wrapper
+                       std::string wrapper = deSerializeString(is2);
+                       std::istringstream wrapper_is(wrapper, std::ios::binary);
+                       f->deSerialize(wrapper_is);
                        if(f->name != "")
                                addNameIdMapping(i, f->name);
                }