Limit speed in collisionMoveResult for avoiding hangs

[dragonfireclient.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index e5014df589e416555db47dc5b4a2ed36da58bf11..3d717bce3fd9f19a93746c3b8d7e67dcfabad97d 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -63,8 +63,9 @@ class EmergeManager {
        std::map<v3s16, BlockEmergeData *> blocks_enqueued;
        std::map<u16, u16> peer_queue_count;
 
-       //biome manager
+       //Mapgen-related structures
        BiomeDefManager *biomedef;
+       std::vector<Ore *> ores;
 
        EmergeManager(IGameDef *gamedef, BiomeDefManager *bdef);
        ~EmergeManager();
@@ -75,7 +76,7 @@ class EmergeManager {
        MapgenParams *createMapgenParams(std::string mgname);
        bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
        
-       bool registerMapgen(std::string name, MapgenFactory *mgfactory);
+       void registerMapgen(std::string name, MapgenFactory *mgfactory);
        MapgenParams *getParamsFromSettings(Settings *settings);
        void setParamsToSettings(Settings *settings);