X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fdefaultsettings.h;h=20274a003802864c5f606831dfb8a78d3ba3bf3e;hb=65c09a96f41705bb8e75fc5ff4276342be91ed11;hp=c0bfcc69c20a0a16cd899f937f73c8aab400aac1;hpb=9e46cbf7ea512330f35d0f2ede0c7c0c085c7cf4;p=minetest.git diff --git a/src/defaultsettings.h b/src/defaultsettings.h index c0bfcc69c..20274a003 100644 --- a/src/defaultsettings.h +++ b/src/defaultsettings.h @@ -1,18 +1,18 @@ /* -Minetest-c55 -Copyright (C) 2011 celeron55, Perttu Ahola +Minetest +Copyright (C) 2013 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or +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 General Public License for more details. +GNU Lesser General Public License for more details. -You should have received a copy of the GNU General Public License along +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. */ @@ -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