Pre-select current game in world creation dialog

[dragonfireclient.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index 0acc89a6daf448bfd329f52c1b0f37841a8ba3a7..fdca93c06253676ec11501d330e6120c68438815 100644 (file)
--- a/src/emerge.h
+++ b/src/emerge.h
@@ -1,3 +1,22 @@
+/*
+Minetest
+Copyright (C) 2010-2013 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU Lesser General Public License as published by
+the Free Software Foundation; either version 2.1 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public License along
+with this program; if not, write to the Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
 #ifndef EMERGE_HEADER
 #define EMERGE_HEADER
 
@@ -7,6 +26,10 @@
 
 #define BLOCK_EMERGE_ALLOWGEN (1<<0)
 
+#define EMERGE_DBG_OUT(x) \
+       { if (enable_mapgen_debug_info) \
+       infostream << "EmergeThread: " x << std::endl; }
+
 class Mapgen;
 class MapgenParams;
 class MapgenFactory;
@@ -14,13 +37,10 @@ class Biome;
 class BiomeDefManager;
 class EmergeThread;
 class ManualMapVoxelManipulator;
-//class ServerMap;
-//class MapBlock;
 
 #include "server.h"
 
 struct BlockMakeData {
-       bool no_op;
        ManualMapVoxelManipulator *vmanip;
        u64 seed;
        v3s16 blockpos_min;
@@ -29,49 +49,55 @@ struct BlockMakeData {
        UniqueQueue<v3s16> transforming_liquid;
        INodeDefManager *nodedef;
 
-//     BlockMakeData();
-//     ~BlockMakeData();
-       
-BlockMakeData():
-       no_op(false),
-       vmanip(NULL),
-       seed(0),
-       nodedef(NULL)
-{}
-
-~BlockMakeData()
-{
-       delete vmanip;
-}
+       BlockMakeData():
+               vmanip(NULL),
+               seed(0),
+               nodedef(NULL)
+       {}
+
+       ~BlockMakeData() { delete vmanip; }
+};
+
+struct BlockEmergeData {
+       u16 peer_requested;
+       u8 flags;
 };
 
 class EmergeManager {
 public:
-       std::map<std::string, MapgenFactory *> mglist;
+       INodeDefManager *ndef;
 
+       std::map<std::string, MapgenFactory *> mglist;
+       
+       std::vector<Mapgen *> mapgen;
+       std::vector<EmergeThread *> emergethread;
+       
        //settings
        MapgenParams *params;
-
+       bool mapgen_debug_info;
+       u16 qlimit_total;
+       u16 qlimit_diskonly;
+       u16 qlimit_generate;
+       
+       //block emerge queue data structures
        JMutex queuemutex;
-       std::map<v3s16, u8> blocks_enqueued; //change to a hashtable later
-       Mapgen *mapgen;
-       EmergeThread *emergethread;
+       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(IGameDef *gamedef);
        ~EmergeManager();
 
        void initMapgens(MapgenParams *mgparams);
        Mapgen *createMapgen(std::string mgname, int mgid,
-                                               MapgenParams *mgparams, EmergeManager *emerge);
+                                               MapgenParams *mgparams);
        MapgenParams *createMapgenParams(std::string mgname);
-       Mapgen *getMapgen();
        bool enqueueBlockEmerge(u16 peer_id, v3s16 p, bool allow_generate);
-       bool popBlockEmerge(v3s16 *pos, u8 *flags);
        
-       bool registerMapgen(std::string name, MapgenFactory *mgfactory);
+       void registerMapgen(std::string name, MapgenFactory *mgfactory);
        MapgenParams *getParamsFromSettings(Settings *settings);
        void setParamsToSettings(Settings *settings);
        
@@ -89,19 +115,20 @@ class EmergeThread : public SimpleThread
        EmergeManager *emerge;
        Mapgen *mapgen;
        bool enable_mapgen_debug_info;
+       int id;
        
 public:
        Event qevent;
        std::queue<v3s16> blockqueue;
        
-       EmergeThread(Server *server):
+       EmergeThread(Server *server, int ethreadid):
                SimpleThread(),
                m_server(server),
                map(NULL),
                emerge(NULL),
-               mapgen(NULL)
+               mapgen(NULL),
+               id(ethreadid)
        {
-               enable_mapgen_debug_info = g_settings->getBool("enable_mapgen_debug_info");
        }
 
        void *Thread();
@@ -115,6 +142,7 @@ class EmergeThread : public SimpleThread
                }
        }
 
+       bool popBlockEmerge(v3s16 *pos, u8 *flags);
        bool getBlockOrStartGen(v3s16 p, MapBlock **b, 
                                                        BlockMakeData *data, bool allow_generate);
 };