Plantlike visual scale: Send sqrt(visual_scale) to old clients

[minetest.git] / src / mg_schematic.h

diff --git a/src/mg_schematic.h b/src/mg_schematic.h
index 3d3e328d3185636a10d92d4ab74cedcb11a43198..1d46e6ac4fc7dfa78ead419b91efb215a5fc160c 100644 (file)
--- a/src/mg_schematic.h
+++ b/src/mg_schematic.h
@@ -29,14 +29,14 @@ class Mapgen;
 class MMVManip;
 class PseudoRandom;
 class NodeResolver;
-class IGameDef;
+class Server;
 
 /*
        Minetest Schematic File Format
 
        All values are stored in big-endian byte order.
        [u32] signature: 'MTSM'
-       [u16] version: 3
+       [u16] version: 4
        [u16] size X
        [u16] size Y
        [u16] size Z
@@ -51,7 +51,9 @@ class IGameDef;
        For each node in schematic:  (for z, y, x)
                [u16] content
        For each node in schematic:
-               [u8] probability of occurance (param1)
+               [u8] param1
+                 bit 0-6: probability
+                 bit 7:   specific node force placement
        For each node in schematic:
                [u8] param2
        }
@@ -60,17 +62,21 @@ class IGameDef;
        1 - Initial version
        2 - Fixed messy never/always place; 0 probability is now never, 0xFF is always
        3 - Added y-slice probabilities; this allows for variable height structures
+       4 - Compressed range of node occurence prob., added per-node force placement bit
 */
 
-/////////////////// Schematic flags
-#define SCHEM_CIDS_UPDATED 0x08
-
+//// Schematic constants
 #define MTSCHEM_FILE_SIGNATURE 0x4d54534d // 'MTSM'
-#define MTSCHEM_FILE_VER_HIGHEST_READ  3
-#define MTSCHEM_FILE_VER_HIGHEST_WRITE 3
+#define MTSCHEM_FILE_VER_HIGHEST_READ  4
+#define MTSCHEM_FILE_VER_HIGHEST_WRITE 4
+
+#define MTSCHEM_PROB_MASK       0x7F
+
+#define MTSCHEM_PROB_NEVER      0x00
+#define MTSCHEM_PROB_ALWAYS     0x7F
+#define MTSCHEM_PROB_ALWAYS_OLD 0xFF
 
-#define MTSCHEM_PROB_NEVER  0x00
-#define MTSCHEM_PROB_ALWAYS 0xFF
+#define MTSCHEM_FORCE_PLACE     0x80
 
 enum SchematicType
 {
@@ -100,8 +106,9 @@ class Schematic : public ObjDef, public NodeResolver {
        bool serializeToLua(std::ostream *os, const std::vector<std::string> &names,
                bool use_comments, u32 indent_spaces);
 
-       void blitToVManip(v3s16 p, MMVManip *vm, Rotation rot, bool force_place);
-       void placeStructure(Map *map, v3s16 p, u32 flags, Rotation rot, bool force_place);
+       void blitToVManip(MMVManip *vm, v3s16 p, Rotation rot, bool force_place);
+       bool placeOnVManip(MMVManip *vm, v3s16 p, u32 flags, Rotation rot, bool force_place);
+       void placeOnMap(Map *map, v3s16 p, u32 flags, Rotation rot, bool force_place);
 
        void applyProbabilities(v3s16 p0,
                std::vector<std::pair<v3s16, u8> > *plist,
@@ -116,7 +123,7 @@ class Schematic : public ObjDef, public NodeResolver {
 
 class SchematicManager : public ObjDefManager {
 public:
-       SchematicManager(IGameDef *gamedef);
+       SchematicManager(Server *server);
        virtual ~SchematicManager() {}
 
        virtual void clear();
@@ -132,7 +139,7 @@ class SchematicManager : public ObjDefManager {
        }
 
 private:
-       IGameDef *m_gamedef;
+       Server *m_server;
 };
 
 void generate_nodelist_and_update_ids(MapNode *nodes, size_t nodecount,