diff options
| author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-09-19 16:00:09 +0200 |
|---|---|---|
| committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2013-09-19 16:00:09 +0200 |
| commit | 923e52eafd132a8ba2435cba4e5cf04a5b15ffd4 (patch) | |
| tree | 51cf6694bc27c554dbea90bc3141cb35d38098a6 /src | |
| parent | 33e36451fb179d14bb4b00fb295c2f7a0874b9d5 (diff) | |
| download | manaserv-923e52eafd132a8ba2435cba4e5cf04a5b15ffd4.tar.gz manaserv-923e52eafd132a8ba2435cba4e5cf04a5b15ffd4.tar.bz2 manaserv-923e52eafd132a8ba2435cba4e5cf04a5b15ffd4.tar.xz manaserv-923e52eafd132a8ba2435cba4e5cf04a5b15ffd4.zip | |
Renamed actor.{h,cpp} to actorcomponent.{h,cpp}
To match the class name.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/game-server/actorcomponent.cpp (renamed from src/game-server/actor.cpp) | 2 | ||||
| -rw-r--r-- | src/game-server/actorcomponent.h (renamed from src/game-server/actor.h) | 6 | ||||
| -rw-r--r-- | src/game-server/being.h | 2 | ||||
| -rw-r--r-- | src/game-server/item.h | 2 | ||||
| -rw-r--r-- | src/game-server/triggerareacomponent.cpp | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 411e3d14..abe96a29 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -208,8 +208,8 @@ SET(SRCS_MANASERVGAME game-server/abilitymanager.h game-server/accountconnection.h game-server/accountconnection.cpp - game-server/actor.h - game-server/actor.cpp + game-server/actorcomponent.h + game-server/actorcomponent.cpp game-server/attribute.h game-server/attribute.cpp game-server/attributemanager.h diff --git a/src/game-server/actor.cpp b/src/game-server/actorcomponent.cpp index 9c839172..83d8b8a0 100644 --- a/src/game-server/actor.cpp +++ b/src/game-server/actorcomponent.cpp @@ -18,7 +18,7 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#include "game-server/actor.h" +#include "game-server/actorcomponent.h" #include "game-server/map.h" #include "game-server/mapcomposite.h" diff --git a/src/game-server/actor.h b/src/game-server/actorcomponent.h index e1110a17..8f256923 100644 --- a/src/game-server/actor.h +++ b/src/game-server/actorcomponent.h @@ -18,8 +18,8 @@ * along with The Mana Server. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef ACTOR_H -#define ACTOR_H +#ifndef ACTORCOMPONENT_H +#define ACTORCOMPONENT_H #include "game-server/map.h" #include "game-server/entity.h" @@ -157,4 +157,4 @@ class ActorComponent : public Component BlockType mBlockType; }; -#endif // ACTOR_H +#endif // ACTORCOMPONENT_H diff --git a/src/game-server/being.h b/src/game-server/being.h index 6c839d6f..e27762ea 100644 --- a/src/game-server/being.h +++ b/src/game-server/being.h @@ -27,7 +27,7 @@ #include <map> #include "limits.h" -#include "game-server/actor.h" +#include "game-server/actorcomponent.h" #include "game-server/attribute.h" #include "game-server/attributemanager.h" #include "game-server/timeout.h" diff --git a/src/game-server/item.h b/src/game-server/item.h index 5936530e..93978ca5 100644 --- a/src/game-server/item.h +++ b/src/game-server/item.h @@ -24,7 +24,7 @@ #include <vector> -#include "game-server/actor.h" +#include "game-server/actorcomponent.h" #include "scripting/script.h" class Entity; diff --git a/src/game-server/triggerareacomponent.cpp b/src/game-server/triggerareacomponent.cpp index dcd4dd1a..9054bf80 100644 --- a/src/game-server/triggerareacomponent.cpp +++ b/src/game-server/triggerareacomponent.cpp @@ -23,7 +23,7 @@ #include "game-server/charactercomponent.h" #include "game-server/mapcomposite.h" -#include "game-server/actor.h" +#include "game-server/actorcomponent.h" #include "game-server/state.h" #include "utils/logger.h" |