Add a setting to enable always flying fast

[minetest.git] / src / settings.h

diff --git a/src/settings.h b/src/settings.h
index b95fbd1845ef4f5eae88ba24f4160b587882134f..1ab6fcc6b550740181ed3eb888a5770144f14361 100644 (file)
--- a/src/settings.h
+++ b/src/settings.h
@@ -3,16 +3,16 @@ Minetest-c55
 Copyright (C) 2010-2011 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 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.
 */
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef SETTINGS_HEADER
 #define SETTINGS_HEADER
 
-#include "common_irrlicht.h"
+#include "irrlichttypes_bloated.h"
 #include <string>
 #include <jthread.h>
 #include <jmutex.h>
@@ -30,8 +30,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <fstream>
 #include <sstream>
 #include "debug.h"
-#include "utility.h"
 #include "log.h"
+#include "util/string.h"
 
 enum ValueType
 {
@@ -147,8 +147,8 @@ class Settings
                if(is.good() == false)
                        return false;
 
-               infostream<<"Parsing configuration file: \""
-                               <<filename<<"\""<<std::endl;
+               /*infostream<<"Parsing configuration file: \""
+                               <<filename<<"\""<<std::endl;*/
                                
                while(parseConfigObject(is));