Pre-select current game in world creation dialog

[dragonfireclient.git] / src / emerge.h

diff --git a/src/emerge.h b/src/emerge.h
index 70b67e731f05360a3fc44198eaa5fd43a3d0bc9d..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
 
@@ -46,6 +65,8 @@ struct BlockEmergeData {
 
 class EmergeManager {
 public:
+       INodeDefManager *ndef;
+
        std::map<std::string, MapgenFactory *> mglist;
        
        std::vector<Mapgen *> mapgen;
@@ -63,10 +84,11 @@ 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(IGameDef *gamedef);
        ~EmergeManager();
 
        void initMapgens(MapgenParams *mgparams);