diff options
Diffstat (limited to 'src/game-server')
-rw-r--r-- | src/game-server/accountconnection.cpp | 2 | ||||
-rw-r--r-- | src/game-server/being.cpp | 2 | ||||
-rw-r--r-- | src/game-server/buysell.cpp | 2 | ||||
-rw-r--r-- | src/game-server/charactercomponent.cpp (renamed from src/game-server/character.cpp) | 2 | ||||
-rw-r--r-- | src/game-server/charactercomponent.h (renamed from src/game-server/character.h) | 0 | ||||
-rw-r--r-- | src/game-server/commandhandler.cpp | 2 | ||||
-rw-r--r-- | src/game-server/inventory.h | 2 | ||||
-rw-r--r-- | src/game-server/mapcomposite.cpp | 2 | ||||
-rw-r--r-- | src/game-server/monster.cpp | 2 | ||||
-rw-r--r-- | src/game-server/npc.cpp | 2 | ||||
-rw-r--r-- | src/game-server/postman.h | 2 | ||||
-rw-r--r-- | src/game-server/quest.cpp | 2 | ||||
-rw-r--r-- | src/game-server/trade.cpp | 2 | ||||
-rw-r--r-- | src/game-server/triggerareacomponent.cpp | 2 |
14 files changed, 13 insertions, 13 deletions
diff --git a/src/game-server/accountconnection.cpp b/src/game-server/accountconnection.cpp index 604fe2ea..6b7b728a 100644 --- a/src/game-server/accountconnection.cpp +++ b/src/game-server/accountconnection.cpp @@ -21,7 +21,7 @@ #include "game-server/accountconnection.h" #include "common/configuration.h" -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "game-server/gamehandler.h" #include "game-server/map.h" #include "game-server/mapcomposite.h" diff --git a/src/game-server/being.cpp b/src/game-server/being.cpp index 8ef74c96..8b4c2967 100644 --- a/src/game-server/being.cpp +++ b/src/game-server/being.cpp @@ -25,7 +25,7 @@ #include "common/configuration.h" #include "common/defines.h" #include "game-server/attributemanager.h" -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "game-server/collisiondetection.h" #include "game-server/mapcomposite.h" #include "game-server/effect.h" diff --git a/src/game-server/buysell.cpp b/src/game-server/buysell.cpp index ecc8793c..97f97c85 100644 --- a/src/game-server/buysell.cpp +++ b/src/game-server/buysell.cpp @@ -20,7 +20,7 @@ #include "game-server/buysell.h" -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "game-server/gamehandler.h" #include "game-server/inventory.h" #include "game-server/itemmanager.h" diff --git a/src/game-server/character.cpp b/src/game-server/charactercomponent.cpp index ea9228a7..8a50d7cd 100644 --- a/src/game-server/character.cpp +++ b/src/game-server/charactercomponent.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "common/configuration.h" #include "game-server/accountconnection.h" diff --git a/src/game-server/character.h b/src/game-server/charactercomponent.h index 57e9d44c..57e9d44c 100644 --- a/src/game-server/character.h +++ b/src/game-server/charactercomponent.h diff --git a/src/game-server/commandhandler.cpp b/src/game-server/commandhandler.cpp index 79758bcf..44559a5e 100644 --- a/src/game-server/commandhandler.cpp +++ b/src/game-server/commandhandler.cpp @@ -22,7 +22,7 @@ #include "game-server/commandhandler.h" #include "game-server/accountconnection.h" -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "game-server/effect.h" #include "game-server/gamehandler.h" #include "game-server/inventory.h" diff --git a/src/game-server/inventory.h b/src/game-server/inventory.h index 949471b6..627d0c97 100644 --- a/src/game-server/inventory.h +++ b/src/game-server/inventory.h @@ -21,7 +21,7 @@ #ifndef INVENTORY_H #define INVENTORY_H -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "net/messageout.h" class ItemClass; diff --git a/src/game-server/mapcomposite.cpp b/src/game-server/mapcomposite.cpp index 83c63fa3..17e7667f 100644 --- a/src/game-server/mapcomposite.cpp +++ b/src/game-server/mapcomposite.cpp @@ -25,7 +25,7 @@ #include "accountconnection.h" #include "common/configuration.h" #include "common/resourcemanager.h" -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "game-server/mapcomposite.h" #include "game-server/map.h" #include "game-server/mapmanager.h" diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp index cf589977..56a08cd9 100644 --- a/src/game-server/monster.cpp +++ b/src/game-server/monster.cpp @@ -23,7 +23,7 @@ #include "common/configuration.h" #include "common/resourcemanager.h" #include "game-server/attributemanager.h" -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "game-server/collisiondetection.h" #include "game-server/item.h" #include "game-server/map.h" diff --git a/src/game-server/npc.cpp b/src/game-server/npc.cpp index 980358da..2b6ab1fd 100644 --- a/src/game-server/npc.cpp +++ b/src/game-server/npc.cpp @@ -21,7 +21,7 @@ #include "game-server/npc.h" -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "game-server/gamehandler.h" #include "game-server/map.h" #include "net/messageout.h" diff --git a/src/game-server/postman.h b/src/game-server/postman.h index 145db9e7..a8d82770 100644 --- a/src/game-server/postman.h +++ b/src/game-server/postman.h @@ -24,7 +24,7 @@ #include <map> #include <string> -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "game-server/entity.h" class Script; diff --git a/src/game-server/quest.cpp b/src/game-server/quest.cpp index 515e6200..4ed8a6fc 100644 --- a/src/game-server/quest.cpp +++ b/src/game-server/quest.cpp @@ -21,7 +21,7 @@ #include "game-server/quest.h" #include "game-server/accountconnection.h" -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "utils/logger.h" #include <cassert> diff --git a/src/game-server/trade.cpp b/src/game-server/trade.cpp index b30eaf79..57bc04e6 100644 --- a/src/game-server/trade.cpp +++ b/src/game-server/trade.cpp @@ -23,7 +23,7 @@ #include "game-server/trade.h" -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "game-server/gamehandler.h" #include "game-server/inventory.h" #include "net/messageout.h" diff --git a/src/game-server/triggerareacomponent.cpp b/src/game-server/triggerareacomponent.cpp index 04e77b6a..dcd4dd1a 100644 --- a/src/game-server/triggerareacomponent.cpp +++ b/src/game-server/triggerareacomponent.cpp @@ -21,7 +21,7 @@ #include "game-server/triggerareacomponent.h" -#include "game-server/character.h" +#include "game-server/charactercomponent.h" #include "game-server/mapcomposite.h" #include "game-server/actor.h" #include "game-server/state.h" |