summaryrefslogtreecommitdiff
path: root/src/network
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/network
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/network')
-rw-r--r--src/network/connection.cpp1
-rw-r--r--src/network/serverpackethandler.cpp1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/network/connection.cpp b/src/network/connection.cpp
index dd69df5bb..6e8bbd6c3 100644
--- a/src/network/connection.cpp
+++ b/src/network/connection.cpp
@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include <iomanip>
#include <errno.h>
#include "connection.h"
-#include "main.h"
#include "serialization.h"
#include "log.h"
#include "porting.h"
diff --git a/src/network/serverpackethandler.cpp b/src/network/serverpackethandler.cpp
index e01aeaa55..30b378ac3 100644
--- a/src/network/serverpackethandler.cpp
+++ b/src/network/serverpackethandler.cpp
@@ -23,7 +23,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "content_abm.h"
#include "content_sao.h"
#include "emerge.h"
-#include "main.h"
#include "nodedef.h"
#include "player.h"
#include "rollback_interface.h"