Fix uninitialized variable Player::local_animation_speed

[minetest.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index b42e82d38237e1dcaab047eb8dc0e46fd49febad..1653199ecbb15d5f59fb83b4c79b7cfab3a79d59 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -21,27 +21,30 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define EMERGE_HEADER
 
 #include <map>
-#include <queue>
-#include "util/thread.h"
+#include "irr_v3d.h"
+#include "util/container.h"
+#include "mapgen.h" // for MapgenParams
+#include "map.h"
 
 #define BLOCK_EMERGE_ALLOWGEN (1<<0)
 
 #define EMERGE_DBG_OUT(x) \
-       { if (enable_mapgen_debug_info) \
-       infostream << "EmergeThread: " x << std::endl; }
-
-class Mapgen;
-struct MapgenParams;
-struct MapgenFactory;
-class Biome;
-class BiomeDefManager;
+       do {                                                   \
+               if (enable_mapgen_debug_info)                      \
+                       infostream << "EmergeThread: " x << std::endl; \
+       } while (0)
+
 class EmergeThread;
-class ManualMapVoxelManipulator;
+class INodeDefManager;
+class Settings;
 
-#include "server.h"
+class BiomeManager;
+class OreManager;
+class DecorationManager;
+class SchematicManager;
 
 struct BlockMakeData {
-       ManualMapVoxelManipulator *vmanip;
+       MMVManip *vmanip;
        u64 seed;
        v3s16 blockpos_min;
        v3s16 blockpos_max;
@@ -67,84 +70,51 @@ class EmergeManager {
 public:
        INodeDefManager *ndef;
 
-       std::map<std::string, MapgenFactory *> mglist;
-       
        std::vector<Mapgen *> mapgen;
        std::vector<EmergeThread *> emergethread;
-       
+
+       bool threads_active;
+
        //settings
-       MapgenParams *params;
+       MapgenParams params;
        bool mapgen_debug_info;
        u16 qlimit_total;
        u16 qlimit_diskonly;
        u16 qlimit_generate;
-       
-       //block emerge queue data structures
+
+       u32 gen_notify_on;
+       std::set<u32> gen_notify_on_deco_ids;
+
+       //// Block emerge queue data structures
        JMutex queuemutex;
        std::map<v3s16, BlockEmergeData *> blocks_enqueued;
        std::map<u16, u16> peer_queue_count;
 
-       //Mapgen-related structures
-       BiomeDefManager *biomedef;
-       std::vector<Ore *> ores;
+       //// Managers of map generation-related components
+       BiomeManager *biomemgr;
+       OreManager *oremgr;
+       DecorationManager *decomgr;
+       SchematicManager *schemmgr;
 
+       //// Methods
        EmergeManager(IGameDef *gamedef);
        ~EmergeManager();
 
-       void initMapgens(MapgenParams *mgparams);
-       Mapgen *createMapgen(std::string mgname, int mgid,
-                                               MapgenParams *mgparams);
-       MapgenParams *createMapgenParams(std::string mgname);
+       void loadMapgenParams();
+       static MapgenSpecificParams *createMapgenParams(const std::string &mgname);
+       void initMapgens();
+       Mapgen *getCurrentMapgen();
+       Mapgen *createMapgen(const std::string &mgname, int mgid,
+               MapgenParams *mgparams);
+       static void getMapgenNames(std::list<const char *> &mgnames);
+       void startThreads();
+       void stopThreads();
        bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
-       
-       void registerMapgen(std::string name, MapgenFactory *mgfactory);
-       MapgenParams *getParamsFromSettings(Settings *settings);
-       void setParamsToSettings(Settings *settings);
-       
+
        //mapgen helper methods
        Biome *getBiomeAtPoint(v3s16 p);
        int getGroundLevelAtPoint(v2s16 p);
        bool isBlockUnderground(v3s16 blockpos);
-       u32 getBlockSeed(v3s16 p);
-};
-
-class EmergeThread : public SimpleThread
-{
-       Server *m_server;
-       ServerMap *map;
-       EmergeManager *emerge;
-       Mapgen *mapgen;
-       bool enable_mapgen_debug_info;
-       int id;
-       
-public:
-       Event qevent;
-       std::queue<v3s16> blockqueue;
-       
-       EmergeThread(Server *server, int ethreadid):
-               SimpleThread(),
-               m_server(server),
-               map(NULL),
-               emerge(NULL),
-               mapgen(NULL),
-               id(ethreadid)
-       {
-       }
-
-       void *Thread();
-
-       void trigger()
-       {
-               setRun(true);
-               if(IsRunning() == false)
-               {
-                       Start();
-               }
-       }
-
-       bool popBlockEmerge(v3s16 *pos, u8 *flags);
-       bool getBlockOrStartGen(v3s16 p, MapBlock **b, 
-                                                       BlockMakeData *data, bool allow_generate);
 };
 
 #endif