summaryrefslogtreecommitdiff
path: root/src/content_sao.cpp
diff options
context:
space:
mode:
authorShadowNinja <shadowninja@minetest.net>2014-09-11 18:22:05 -0400
committerShadowNinja <shadowninja@minetest.net>2014-09-21 14:39:35 -0400
commit6bc4cad0eddd7a7cf593ca1471599e2d75727379 (patch)
treed05d5f039648d18f49fc0cf56132b2e9a5c88e09 /src/content_sao.cpp
parent2ae5d3f3abc7ac5ee96c4dfc7eeead045fdc775e (diff)
downloadminetest-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_sao.cpp')
-rw-r--r--src/content_sao.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/content_sao.cpp b/src/content_sao.cpp
index 4ee92f4d3..40313f7a5 100644
--- a/src/content_sao.cpp
+++ b/src/content_sao.cpp
@@ -18,6 +18,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/
#include "content_sao.h"
+#include "util/serialize.h"
+#include "util/mathconstants.h"
#include "collision.h"
#include "environment.h"
#include "settings.h"
@@ -29,8 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "player.h"
#include "scripting_game.h"
#include "genericobject.h"
-#include "util/serialize.h"
-#include "util/mathconstants.h"
+#include "log.h"
std::map<u16, ServerActiveObject::Factory> ServerActiveObject::m_types;