diff options
author | ShadowNinja <shadowninja@minetest.net> | 2014-09-11 18:22:05 -0400 |
---|---|---|
committer | ShadowNinja <shadowninja@minetest.net> | 2014-09-21 14:39:35 -0400 |
commit | 6bc4cad0eddd7a7cf593ca1471599e2d75727379 (patch) | |
tree | d05d5f039648d18f49fc0cf56132b2e9a5c88e09 /src/content_cao.cpp | |
parent | 2ae5d3f3abc7ac5ee96c4dfc7eeead045fdc775e (diff) | |
download | minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.tar.gz minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.tar.bz2 minetest-6bc4cad0eddd7a7cf593ca1471599e2d75727379.zip |
Split settings into seperate source and header files
This also cleans up settings a bit
Diffstat (limited to 'src/content_cao.cpp')
-rw-r--r-- | src/content_cao.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/content_cao.cpp b/src/content_cao.cpp index 02622f5b4..d1de23d2a 100644 --- a/src/content_cao.cpp +++ b/src/content_cao.cpp @@ -17,14 +17,20 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +#include <ICameraSceneNode.h> +#include <ITextSceneNode.h> +#include <IBillboardSceneNode.h> +#include <IMeshManipulator.h> +#include <IAnimatedMeshSceneNode.h> +#include <IBoneSceneNode.h> #include "content_cao.h" +#include "util/numeric.h" // For IntervalLimiter +#include "util/serialize.h" +#include "util/mathconstants.h" #include "tile.h" #include "environment.h" #include "collision.h" #include "settings.h" -#include <ICameraSceneNode.h> -#include <ITextSceneNode.h> -#include <IBillboardSceneNode.h> #include "serialization.h" // For decompressZlib #include "gamedef.h" #include "clientobject.h" @@ -36,15 +42,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "sound.h" #include "nodedef.h" #include "localplayer.h" -#include "util/numeric.h" // For IntervalLimiter -#include "util/serialize.h" -#include "util/mathconstants.h" #include "map.h" #include "main.h" // g_settings #include "camera.h" // CameraModes -#include <IMeshManipulator.h> -#include <IAnimatedMeshSceneNode.h> -#include <IBoneSceneNode.h> +#include "log.h" class Settings; struct ToolCapabilities; |