Update minetest.conf.example and settings_translation_file.cpp (#8278)

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

diff --git a/src/nodedef.h b/src/nodedef.h
index f99f7f3219be6097982cb029e7c3dd0fd9e32725..60d91f8d99b689f921ae840f66b6cca66a8ae120 100644 (file)
--- a/src/nodedef.h
+++ b/src/nodedef.h
@@ -35,6 +35,9 @@ class Client;
 #include "constants.h" // BS
 #include "tileanimation.h"
 
+// PROTOCOL_VERSION >= 37
+static const u8 CONTENTFEATURES_VERSION = 13;
+
 class IItemDefManager;
 class ITextureSource;
 class IShaderSource;
@@ -405,8 +408,6 @@ struct ContentFeatures
        void reset();
        void serialize(std::ostream &os, u16 protocol_version) const;
        void deSerialize(std::istream &is);
-       void serializeOld(std::ostream &os, u16 protocol_version) const;
-       void deSerializeOld(std::istream &is, int version);
        /*!
         * Since vertex alpha is no longer supported, this method
         * adds opacity directly to the texture pixels.
@@ -733,9 +734,10 @@ public:
        virtual void resolveNodeNames() = 0;
 
        bool getIdFromNrBacklog(content_t *result_out,
-               const std::string &node_alt, content_t c_fallback);
+               const std::string &node_alt, content_t c_fallback,
+               bool error_on_fallback = true);
        bool getIdsFromNrBacklog(std::vector<content_t> *result_out,
-               bool all_required=false, content_t c_fallback=CONTENT_IGNORE);
+               bool all_required = false, content_t c_fallback = CONTENT_IGNORE);
 
        void nodeResolveInternal();