diff options
author | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-03-16 23:20:38 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <thorbjorn@lindeijer.nl> | 2012-04-04 20:18:50 +0200 |
commit | 4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07 (patch) | |
tree | cb6fc8a565689caaded7977fe249820a61dadee9 /src/game-server/state.cpp | |
parent | b30e3355dbbd160ad77f2987b9758ad349830cac (diff) | |
download | manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.tar.gz manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.tar.bz2 manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.tar.xz manaserv-4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07.zip |
Renamed Thing to Entity
In preparation for using an entity/component system for the entities
in the game world, this name will be more recognizable and easier to
talk about.
Reviewed-by: Yohann Ferreira
Diffstat (limited to 'src/game-server/state.cpp')
-rw-r--r-- | src/game-server/state.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/game-server/state.cpp b/src/game-server/state.cpp index 0e7bea25..843bfadb 100644 --- a/src/game-server/state.cpp +++ b/src/game-server/state.cpp @@ -482,7 +482,7 @@ void GameState::update(int worldTime) delayedEvents.clear(); } -bool GameState::insert(Thing *ptr) +bool GameState::insert(Entity *ptr) { assert(!dbgLockObjects); MapComposite *map = ptr->getMap(); @@ -550,7 +550,7 @@ bool GameState::insert(Thing *ptr) case OBJECT_ACTOR: case OBJECT_OTHER: default: - LOG_DEBUG("Thing inserted: " << obj->getType()); + LOG_DEBUG("Entity inserted: " << obj->getType()); } obj->raiseUpdateFlags(UPDATEFLAG_NEW_ON_MAP); @@ -573,14 +573,14 @@ bool GameState::insert(Thing *ptr) return true; } -bool GameState::insertOrDelete(Thing *ptr) +bool GameState::insertOrDelete(Entity *ptr) { if (insert(ptr)) return true; delete ptr; return false; } -void GameState::remove(Thing *ptr) +void GameState::remove(Entity *ptr) { assert(!dbgLockObjects); MapComposite *map = ptr->getMap(); @@ -618,7 +618,7 @@ void GameState::remove(Thing *ptr) case OBJECT_ACTOR: case OBJECT_OTHER: default: - LOG_DEBUG("Thing removed: " << ptr->getType()); + LOG_DEBUG("Entity removed: " << ptr->getType()); } if (ptr->canMove()) |