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/game-server | |
parent | 1f078e246ff03587e3ead220cac17bf343fb3328 (diff) | |
download | manaserv-5b3c4a585b211b03fb2999cddd2558e030ed5c0e.tar.gz manaserv-5b3c4a585b211b03fb2999cddd2558e030ed5c0e.tar.bz2 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/game-server')
-rw-r--r-- | src/game-server/attribute.h | 2 | ||||
-rw-r--r-- | src/game-server/attributemanager.cpp | 2 | ||||
-rw-r--r-- | src/game-server/being.cpp | 2 | ||||
-rw-r--r-- | src/game-server/buysell.cpp | 3 | ||||
-rw-r--r-- | src/game-server/character.h | 4 | ||||
-rw-r--r-- | src/game-server/itemmanager.cpp | 2 | ||||
-rw-r--r-- | src/game-server/map.cpp | 2 | ||||
-rw-r--r-- | src/game-server/monster.h | 2 | ||||
-rw-r--r-- | src/game-server/thing.h | 3 |
9 files changed, 11 insertions, 11 deletions
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> |