diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-03-19 11:50:45 +0100 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2011-03-20 15:09:09 +0100 |
| commit | 5b3c4a585b211b03fb2999cddd2558e030ed5c0e (patch) | |
| tree | e05fda21af7b57d0747aa1cf0371b5591a415234 /src/account-server | |
| parent | 1f078e246ff03587e3ead220cac17bf343fb3328 (diff) | |
| download | manaserv-5b3c4a585b211b03fb2999cddd2558e030ed5c0e.tar.gz manaserv-5b3c4a585b211b03fb2999cddd2558e030ed5c0e.tar.xz manaserv-5b3c4a585b211b03fb2999cddd2558e030ed5c0e.zip | |
Moved defines.h and manaserv_protocol.h into 'common'
Just seems a bit more organized to me.
Diffstat (limited to 'src/account-server')
| -rw-r--r-- | src/account-server/accounthandler.cpp | 2 | ||||
| -rw-r--r-- | src/account-server/character.h | 2 | ||||
| -rw-r--r-- | src/account-server/main-account.cpp | 4 | ||||
| -rw-r--r-- | src/account-server/serverhandler.cpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp index 1a2ca42..cb587ae 100644 --- a/src/account-server/accounthandler.cpp +++ b/src/account-server/accounthandler.cpp @@ -20,7 +20,6 @@ #include "account-server/accounthandler.h" -#include "manaserv_protocol.h" #include "account-server/account.h" #include "account-server/accountclient.h" #include "account-server/character.h" @@ -28,6 +27,7 @@ #include "account-server/serverhandler.h" #include "chat-server/chathandler.h" #include "common/configuration.h" +#include "common/manaserv_protocol.h" #include "common/resourcemanager.h" #include "common/transaction.h" #include "net/connectionhandler.h" diff --git a/src/account-server/character.h b/src/account-server/character.h index cab6dc3..74fe923 100644 --- a/src/account-server/character.h +++ b/src/account-server/character.h @@ -25,7 +25,7 @@ #include <vector> #include <map> -#include "defines.h" +#include "common/defines.h" #include "common/inventorydata.h" #include "utils/point.h" diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp index 9447cb0..5520fb8 100644 --- a/src/account-server/main-account.cpp +++ b/src/account-server/main-account.cpp @@ -31,6 +31,8 @@ #include "chat-server/guildmanager.h" #include "chat-server/post.h" #include "common/configuration.h" +#include "common/defines.h" +#include "common/manaserv_protocol.h" #include "common/resourcemanager.h" #include "net/bandwidth.h" #include "net/connectionhandler.h" @@ -40,8 +42,6 @@ #include "utils/stringfilter.h" #include "utils/time.h" #include "utils/timer.h" -#include "defines.h" -#include "manaserv_protocol.h" #include <cstdlib> #include <getopt.h> diff --git a/src/account-server/serverhandler.cpp b/src/account-server/serverhandler.cpp index d2beb1b..f228e04 100644 --- a/src/account-server/serverhandler.cpp +++ b/src/account-server/serverhandler.cpp @@ -29,15 +29,15 @@ #include "account-server/character.h" #include "account-server/storage.h" #include "chat-server/post.h" -#include "common/transaction.h" #include "common/configuration.h" +#include "common/manaserv_protocol.h" +#include "common/transaction.h" #include "net/connectionhandler.h" #include "net/messageout.h" #include "net/netcomputer.h" #include "serialize/characterdata.h" #include "utils/logger.h" #include "utils/tokendispenser.h" -#include "manaserv_protocol.h" using namespace ManaServ; |