summaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorTametomo <irarice@gmail.com>2009-05-05 07:11:44 -0600
committerBjørn Lindeijer <bjorn@lindeijer.nl>2009-05-07 01:18:05 +0200
commit67f53660db85c2f325472701517e04c446ec8ed4 (patch)
tree1f04d3e4ed3b636cfc30a377fb55e7191ff72b08 /src/main.cpp
parent504222b812b41d37b5a1b28393f66fd292bf9f87 (diff)
downloadmana-67f53660db85c2f325472701517e04c446ec8ed4.tar.gz
mana-67f53660db85c2f325472701517e04c446ec8ed4.tar.bz2
mana-67f53660db85c2f325472701517e04c446ec8ed4.tar.xz
mana-67f53660db85c2f325472701517e04c446ec8ed4.zip
Moved two files which held net data into the net folder. Considering
their function, this is a much better place to put them. Signed-off-by: Tametomo <irarice@gmail.com> Signed-off-by: Bjørn Lindeijer <bjorn@lindeijer.nl>
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 6d48bf8e..0fa4044a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -30,12 +30,10 @@
#include "localplayer.h"
#include "lockedarray.h"
#include "log.h"
-#include "logindata.h"
#ifdef USE_OPENGL
#include "openglgraphics.h"
#endif
#include "playerrelations.h"
-#include "serverinfo.h"
#include "sound.h"
#include "statuseffect.h"
#include "units.h"
@@ -63,9 +61,11 @@
#include "net/charhandler.h"
#include "net/generalhandler.h"
+#include "net/logindata.h"
#include "net/loginhandler.h"
#include "net/maphandler.h"
#include "net/net.h"
+#include "net/serverinfo.h"
#ifdef TMWSERV_SUPPORT
#include "net/tmwserv/charserverhandler.h"
#include "net/tmwserv/connection.h"