summaryrefslogtreecommitdiff
path: root/src/camera.cpp
diff options
context:
space:
mode:
authorCraig Robbins <kde.psych@gmail.com>2015-04-01 23:01:28 +1000
committerCraig Robbins <kde.psych@gmail.com>2015-04-01 23:04:25 +1000
commit9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba (patch)
treea06f321422fb501ea6c28571a9ac31bf7d09c43a /src/camera.cpp
parent113bdd3ec0608655d1ab36886b4708bb8ccb7870 (diff)
downloadminetest-9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba.tar.gz
minetest-9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba.tar.bz2
minetest-9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba.zip
Move globals from main.cpp to more sane locations
Move debug streams to log.cpp|h Move GUI-related globals to clientlauncher Move g_settings and g_settings_path to settings.cpp|h Move g_menuclouds to clouds.cpp|h Move g_profiler to profiler.cpp|h
Diffstat (limited to 'src/camera.cpp')
-rw-r--r--src/camera.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/camera.cpp b/src/camera.cpp
index 0152f7041..ca28555d2 100644
--- a/src/camera.cpp
+++ b/src/camera.cpp
@@ -20,14 +20,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "camera.h"
#include "debug.h"
#include "client.h"
-#include "main.h" // for g_settings
#include "map.h"
-#include "clientmap.h" // MapDrawControl
+#include "clientmap.h" // MapDrawControl
#include "player.h"
#include <cmath>
#include "settings.h"
#include "wieldmesh.h"
-#include "noise.h" // easeCurve
+#include "noise.h" // easeCurve
#include "gamedef.h"
#include "sound.h"
#include "event.h"