Fixes for android

[minetest.git] / src / mg_schematic.h

diff --git a/src/mg_schematic.h b/src/mg_schematic.h
index df54d79bae0e008686f6c37c01a9c5bbf522130a..ad5afb15f5d3a864032fbc5351b53f5c5b51dfb5 100644 (file)
--- a/src/mg_schematic.h
+++ b/src/mg_schematic.h
@@ -26,7 +26,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class Map;
 class Mapgen;
-class ManualMapVoxelManipulator;
+class MMVManip;
 class PseudoRandom;
 class NodeResolver;
 
@@ -42,7 +42,7 @@ class NodeResolver;
 #define MTSCHEM_PROB_ALWAYS 0xFF
 
 
-class Schematic : public GenElement {
+class Schematic : public GenElement, public NodeResolver {
 public:
        std::vector<content_t> c_nodes;
 
@@ -52,14 +52,16 @@ class Schematic : public GenElement {
        u8 *slice_probs;
 
        Schematic();
-       ~Schematic();
+       virtual ~Schematic();
+
+       virtual void resolveNodeNames(NodeResolveInfo *nri);
 
        void updateContentIds();
 
-       void blitToVManip(v3s16 p, ManualMapVoxelManipulator *vm,
+       void blitToVManip(v3s16 p, MMVManip *vm,
                Rotation rot, bool force_placement, INodeDefManager *ndef);
 
-       bool loadSchematicFromFile(const char *filename, NodeResolver *resolver,
+       bool loadSchematicFromFile(const char *filename, INodeDefManager *ndef,
                std::map<std::string, std::string> &replace_names);
        void saveSchematicToFile(const char *filename, INodeDefManager *ndef);
        bool getSchematicFromMap(Map *map, v3s16 p1, v3s16 p2);
@@ -86,7 +88,7 @@ class SchematicManager : public GenElementManager {
 };
 
 void build_nnlist_and_update_ids(MapNode *nodes, u32 nodecount,
-                                       std::vector<content_t> *usednodes);
+       std::vector<content_t> *usednodes);
 
 
 #endif