Moved defines.h and manaserv_protocol.h into 'common'

Just seems a bit more organized to me.

24 files changed, 29 insertions, 28 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0633ffda..fe5b0788 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -100,11 +100,11 @@ MARK_AS_ADVANCED(PHYSFS_INCLUDE_DIR)
 MARK_AS_ADVANCED(PHYSFS_LIBRARY)
 
 SET(SRCS
-    defines.h
-    manaserv_protocol.h
     common/configuration.h
     common/configuration.cpp
+    common/defines.h
     common/inventorydata.h
+    common/manaserv_protocol.h
     common/resourcemanager.h
     common/resourcemanager.cpp
     net/bandwidth.h
diff --git a/src/account-server/accounthandler.cpp b/src/account-server/accounthandler.cpp
index 1a2ca424..cb587ae5 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 cab6dc38..74fe923c 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 9447cb05..5520fb8e 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 d2beb1bf..f228e043 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;
 
diff --git a/src/chat-server/chatchannelmanager.cpp b/src/chat-server/chatchannelmanager.cpp
index 7f7e1c41..a94ede24 100644
--- a/src/chat-server/chatchannelmanager.cpp
+++ b/src/chat-server/chatchannelmanager.cpp
@@ -22,12 +22,12 @@
 
 #include "chat-server/chatchannelmanager.h"
 
-#include "manaserv_protocol.h"
 #include "account-server/storage.h"
 #include "chat-server/chatclient.h"
 #include "chat-server/chathandler.h"
 #include "chat-server/guildmanager.h"
 #include "common/configuration.h"
+#include "common/manaserv_protocol.h"
 #include "utils/stringfilter.h"
 
 using namespace ManaServ;
diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp
index f69d51f2..1f063c18 100644
--- a/src/chat-server/chathandler.cpp
+++ b/src/chat-server/chathandler.cpp
@@ -23,13 +23,13 @@
 #include <string>
 #include <sstream>
 
-#include "manaserv_protocol.h"
 #include "account-server/character.h"
 #include "account-server/storage.h"
 #include "chat-server/guildmanager.h"
 #include "chat-server/chatchannelmanager.h"
 #include "chat-server/chatclient.h"
 #include "chat-server/chathandler.h"
+#include "common/manaserv_protocol.h"
 #include "common/transaction.h"
 #include "net/connectionhandler.h"
 #include "net/messagein.h"
diff --git a/src/chat-server/guild.cpp b/src/chat-server/guild.cpp
index ba1fdae1..8ec2c8cc 100644
--- a/src/chat-server/guild.cpp
+++ b/src/chat-server/guild.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "guild.h"
-#include "defines.h"
+#include "common/defines.h"
 
 #include <algorithm>
 
diff --git a/src/chat-server/guildhandler.cpp b/src/chat-server/guildhandler.cpp
index 6cc301fd..5e2b6d6f 100644
--- a/src/chat-server/guildhandler.cpp
+++ b/src/chat-server/guildhandler.cpp
@@ -31,7 +31,8 @@
 #include "net/messagein.h"
 #include "net/messageout.h"
 
-#include "manaserv_protocol.h"
+#include "common/manaserv_protocol.h"
+
 using namespace ManaServ;
 
 void ChatHandler::sendGuildInvite(const std::string &invitedName,
diff --git a/src/chat-server/guildmanager.cpp b/src/chat-server/guildmanager.cpp
index d7c838f4..71d9ee36 100644
--- a/src/chat-server/guildmanager.cpp
+++ b/src/chat-server/guildmanager.cpp
@@ -20,8 +20,8 @@
 
 #include "guildmanager.h"
 #include "guild.h"
-#include "manaserv_protocol.h"
-#include "defines.h"
+#include "common/defines.h"
+#include "common/manaserv_protocol.h"
 #include "account-server/storage.h"
 #include "chat-server/chatclient.h"
 #include "chat-server/chathandler.h"
diff --git a/src/chat-server/partyhandler.cpp b/src/chat-server/partyhandler.cpp
index a285ee9b..2c105468 100644
--- a/src/chat-server/partyhandler.cpp
+++ b/src/chat-server/partyhandler.cpp
@@ -28,7 +28,7 @@
 #include "net/messagein.h"
 #include "net/messageout.h"
 
-#include "manaserv_protocol.h"
+#include "common/manaserv_protocol.h"
 
 #include <algorithm>
 
diff --git a/src/defines.h b/src/common/defines.h
index c14aca50..c14aca50 100644
--- a/src/defines.h
+++ b/src/common/defines.h
diff --git a/src/manaserv_protocol.h b/src/common/manaserv_protocol.h
index 337f2e27..337f2e27 100644
--- a/src/manaserv_protocol.h
+++ b/src/common/manaserv_protocol.h
diff --git a/src/game-server/attribute.h b/src/game-server/attribute.h
index 85254437..2725fad3 100644
--- a/src/game-server/attribute.h
+++ b/src/game-server/attribute.h
@@ -21,7 +21,7 @@
 #ifndef ATTRIBUTE_H
 #define ATTRIBUTE_H
 
-#include "defines.h"
+#include "common/defines.h"
 #include <vector>
 #include <list>
 
diff --git a/src/game-server/attributemanager.cpp b/src/game-server/attributemanager.cpp
index 8f7d32d1..3680844b 100644
--- a/src/game-server/attributemanager.cpp
+++ b/src/game-server/attributemanager.cpp
@@ -20,11 +20,11 @@
 
 #include "game-server/attributemanager.h"
 
+#include "common/defines.h"
 #include "common/resourcemanager.h"
 #include "utils/string.h"
 #include "utils/logger.h"
 #include "utils/xml.h"
-#include "defines.h"
 
 void AttributeManager::initialize()
 {
diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp
index e0e0dcc1..b8cda8a3 100644
--- a/src/game-server/being.cpp
+++ b/src/game-server/being.cpp
@@ -22,8 +22,8 @@
 
 #include "game-server/being.h"
 
-#include "defines.h"
 #include "common/configuration.h"
+#include "common/defines.h"
 #include "game-server/attributemanager.h"
 #include "game-server/character.h"
 #include "game-server/collisiondetection.h"
diff --git a/src/game-server/buysell.cpp b/src/game-server/buysell.cpp
index c0a16bf7..a9658546 100644
--- a/src/game-server/buysell.cpp
+++ b/src/game-server/buysell.cpp
@@ -26,8 +26,7 @@
 #include "game-server/itemmanager.h"
 #include "game-server/item.h"
 #include "net/messageout.h"
-
-#include "defines.h"
+#include "common/defines.h"
 
 #include <algorithm>
 
diff --git a/src/game-server/character.h b/src/game-server/character.h
index ade13a5d..83445916 100644
--- a/src/game-server/character.h
+++ b/src/game-server/character.h
@@ -25,10 +25,10 @@
 #include <string>
 #include <vector>
 
+#include "common/defines.h"
+#include "common/manaserv_protocol.h"
 #include "common/inventorydata.h"
 #include "game-server/being.h"
-#include "manaserv_protocol.h"
-#include "defines.h"
 #include "utils/logger.h"
 
 class BuySell;
diff --git a/src/game-server/itemmanager.cpp b/src/game-server/itemmanager.cpp
index 6549618b..ecf9555a 100644
--- a/src/game-server/itemmanager.cpp
+++ b/src/game-server/itemmanager.cpp
@@ -20,7 +20,7 @@
 
 #include "game-server/itemmanager.h"
 
-#include "defines.h"
+#include "common/defines.h"
 #include "common/resourcemanager.h"
 #include "game-server/attributemanager.h"
 #include "game-server/item.h"
diff --git a/src/game-server/map.cpp b/src/game-server/map.cpp
index 5947043e..b824aaac 100644
--- a/src/game-server/map.cpp
+++ b/src/game-server/map.cpp
@@ -26,7 +26,7 @@
 
 #include "game-server/map.h"
 
-#include "defines.h"
+#include "common/defines.h"
 
 /**
  * Stores information used during path finding for each tile of a map.
diff --git a/src/game-server/monster.h b/src/game-server/monster.h
index a9512146..7d459c45 100644
--- a/src/game-server/monster.h
+++ b/src/game-server/monster.h
@@ -27,7 +27,7 @@
 
 #include "game-server/being.h"
 #include "game-server/eventlistener.h"
-#include "defines.h"
+#include "common/defines.h"
 
 class ItemClass;
 class Script;
diff --git a/src/game-server/thing.h b/src/game-server/thing.h
index a8a58a04..a5e1bd8f 100644
--- a/src/game-server/thing.h
+++ b/src/game-server/thing.h
@@ -21,7 +21,8 @@
 #ifndef THING_H
 #define THING_H
 
-#include "manaserv_protocol.h"
+#include "common/manaserv_protocol.h"
+
 using namespace ManaServ;
 
 #include <set>
diff --git a/src/serialize/characterdata.h b/src/serialize/characterdata.h
index 009d0efa..203f4a70 100644
--- a/src/serialize/characterdata.h
+++ b/src/serialize/characterdata.h
@@ -23,7 +23,7 @@
 
 #include <map>
 
-#include "defines.h"
+#include "common/defines.h"
 #include "common/inventorydata.h"
 #include "net/messagein.h"
 #include "net/messageout.h"
diff --git a/src/utils/speedconv.cpp b/src/utils/speedconv.cpp
index cbea2c1e..f917a553 100644
--- a/src/utils/speedconv.cpp
+++ b/src/utils/speedconv.cpp
@@ -20,7 +20,7 @@
 
 #include "utils/speedconv.h"
 
-#include "defines.h"
+#include "common/defines.h"
 
 // Defines the max base scale used to compute the raw speed system.
 // The raw speed is the number of tile moves per server tick multiplied the