Merge remote branch 'origin/master'

1 files changed, 22 insertions, 1 deletions

diff --git a/src/emerge.h b/src/emerge.h
index 3d717bce3..fdca93c06 100644
--- 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;
@@ -67,7 +88,7 @@ public:
 	BiomeDefManager *biomedef;
 	std::vector<Ore *> ores;
 
-	EmergeManager(IGameDef *gamedef, BiomeDefManager *bdef);
+	EmergeManager(IGameDef *gamedef);
 	~EmergeManager();
 
 	void initMapgens(MapgenParams *mgparams);