Decoration: Fix schematic probability mess with new MTS file version

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

diff --git a/src/mapgen.h b/src/mapgen.h
index 4ed81b99b854287a0c5bd801e6bb9dda99863b28..6ed2c09943d71f87cb0cc865f40df6c71d20ccda 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -23,10 +23,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "irrlichttypes_extrabloated.h"
 #include "util/container.h" // UniqueQueue
 #include "gamedef.h"
+#include "nodedef.h"
 #include "mapnode.h"
 #include "noise.h"
 #include "settings.h"
-#include <map>
 
 /////////////////// Mapgen flags
 #define MG_TREES         0x01
@@ -36,6 +36,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define MGV6_BIOME_BLEND 0x10
 #define MG_FLAT          0x20
 #define MG_NOLIGHT       0x40
+#define MGV7_MOUNTAINS   0x80
+#define MGV7_RIDGES      0x100
 
 /////////////////// Ore generation flags
 // Use absolute value of height to determine ore placement
@@ -61,7 +63,6 @@ class EmergeManager;
 class MapBlock;
 class ManualMapVoxelManipulator;
 class VoxelManipulator;
-class INodeDefManager;
 struct BlockMakeData;
 class VoxelArea;
 class Map;
@@ -147,9 +148,9 @@ enum OreType {
 class Ore {
 public:
        std::string ore_name;
-       std::string wherein_name;
+       std::vector<std::string> wherein_names;
        content_t ore;
-       content_t wherein;  // the node to be replaced
+       std::vector<content_t> wherein;  // the node to be replaced
        u32 clust_scarcity; // ore cluster has a 1-in-clust_scarcity chance of appearing at a node
        s16 clust_num_ores; // how many ore nodes are in a chunk
        s16 clust_size;     // how large (in nodes) a chunk of ore is
@@ -163,7 +164,6 @@ public:
        
        Ore() {
                ore     = CONTENT_IGNORE;
-               wherein = CONTENT_IGNORE;
                np      = NULL;
                noise   = NULL;
        }
@@ -214,6 +214,8 @@ struct CutoffData {
 
 class Decoration {
 public:
+       INodeDefManager *ndef;
+       
        int mapseed;
        std::string place_on_name;
        content_t c_place_on;
@@ -258,13 +260,9 @@ public:
        virtual std::string getName();
 };
 
-enum Rotation {
-       ROTATE_0,
-       ROTATE_90,
-       ROTATE_180,
-       ROTATE_270,
-       ROTATE_RAND,
-};
+#define MTSCHEM_FILE_SIGNATURE 0x4d54534d // 'MTSM'
+#define MTSCHEM_PROB_NEVER  0x00
+#define MTSCHEM_PROB_ALWAYS 0xFF
 
 class DecoSchematic : public Decoration {
 public:
@@ -272,6 +270,7 @@ public:
        
        std::vector<std::string> *node_names;
        std::vector<content_t> c_nodes;
+       std::map<std::string, std::string> replacements;
 
        u32 flags;
        Rotation rotation;
@@ -287,14 +286,14 @@ public:
        virtual std::string getName();
        
        void blitToVManip(v3s16 p, ManualMapVoxelManipulator *vm,
-                                       int rot, bool force_placement);
+                                       Rotation rot, bool force_placement);
        
        bool loadSchematicFile();
        void saveSchematicFile(INodeDefManager *ndef);
        
        bool getSchematicFromMap(Map *map, v3s16 p1, v3s16 p2);
        void placeStructure(Map *map, v3s16 p);
-       void applyProbabilities(std::vector<std::pair<v3s16, s16> > *plist, v3s16 p0);
+       void applyProbabilities(std::vector<std::pair<v3s16, u8> > *plist, v3s16 p0);
 };
 
 void build_nnlist_and_update_ids(MapNode *nodes, u32 nodecount,