Add MapSettingsManager and new mapgen setting script API functions

[dragonfireclient.git] / src / defaultsettings.h

diff --git a/src/defaultsettings.h b/src/defaultsettings.h
index faac7a886dde472c45702d9f0abd6f46d952baee..20274a003802864c5f606831dfb8a78d3ba3bf3e 100644 (file)
--- a/src/defaultsettings.h
+++ b/src/defaultsettings.h
@@ -1,6 +1,6 @@
 /*
-Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Minetest
+Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
 
 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
@@ -22,7 +22,18 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 class Settings;
 
+/**
+ * initialize basic default settings
+ * @param settings pointer to settings
+ */
 void set_default_settings(Settings *settings);
 
+/**
+ * override a default settings by settings from another settings element
+ * @param settings target settings pointer
+ * @param from source settings pointer
+ */
+void override_default_settings(Settings *settings, Settings *from);
+
 #endif