Fix formspec escaping, add escaping to info.txt for texture packs.

[dragonfireclient.git] / src / mapgen.h

diff --git a/src/mapgen.h b/src/mapgen.h
index 7229e89967660e7183f7c95bb81ccbeaf653e08b..040320f27cf8f3155024ab462638b85f321f777e 100644 (file)
--- a/src/mapgen.h
+++ b/src/mapgen.h
@@ -20,13 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef MAPGEN_HEADER
 #define MAPGEN_HEADER
 
-#include "irrlichttypes_extrabloated.h"
+#include "irrlichttypes_bloated.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
@@ -63,7 +63,6 @@ class EmergeManager;
 class MapBlock;
 class ManualMapVoxelManipulator;
 class VoxelManipulator;
-class INodeDefManager;
 struct BlockMakeData;
 class VoxelArea;
 class Map;
@@ -115,11 +114,6 @@ class Mapgen {
 
        virtual void makeChunk(BlockMakeData *data) {}
        virtual int getGroundLevelAtPoint(v2s16 p) { return 0; }
-
-       //Legacy functions for Farmesh (pending removal)
-       static bool get_have_beach(u64 seed, v2s16 p2d);
-       static double tree_amount_2d(u64 seed, v2s16 p);
-       static s16 find_ground_level_from_noise(u64 seed, v2s16 p2d, s16 precision);
 };
 
 struct MapgenFactory {
@@ -149,9 +143,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
@@ -165,7 +159,6 @@ class Ore {
        
        Ore() {
                ore     = CONTENT_IGNORE;
-               wherein = CONTENT_IGNORE;
                np      = NULL;
                noise   = NULL;
        }
@@ -216,6 +209,8 @@ struct CutoffData {
 
 class Decoration {
 public:
+       INodeDefManager *ndef;
+       
        int mapseed;
        std::string place_on_name;
        content_t c_place_on;
@@ -260,13 +255,9 @@ class DecoSimple : public Decoration {
        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:
@@ -274,6 +265,7 @@ class DecoSchematic : public Decoration {
        
        std::vector<std::string> *node_names;
        std::vector<content_t> c_nodes;
+       std::map<std::string, std::string> replacements;
 
        u32 flags;
        Rotation rotation;
@@ -289,14 +281,14 @@ class DecoSchematic : public Decoration {
        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,