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.h | |
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.h')
-rw-r--r-- | src/game-server/state.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/game-server/state.h b/src/game-server/state.h index 6fae5c89..ba87a767 100644 --- a/src/game-server/state.h +++ b/src/game-server/state.h @@ -24,7 +24,7 @@ #include <string> class MapComposite; -class Thing; +class Entity; class Actor; class Character; @@ -37,30 +37,30 @@ namespace GameState void update(int worldTime); /** - * Inserts an thing in the game world. - * @return false if the insertion failed and the thing is in limbo. + * Inserts an entity in the game world. + * @return false if the insertion failed and the entity is in limbo. * @note No update may be in progress. */ - bool insert(Thing *) + bool insert(Entity *) # ifdef __GNUC__ __attribute__((warn_unused_result)) # endif ; /** - * Inserts a thing in the game world. Deletes the thing if the insertion + * Inserts a entity in the game world. Deletes the entity if the insertion * failed. * @return false if the insertion failed. * @note No update may be in progress. Invalid for characters. */ - bool insertOrDelete(Thing *); + bool insertOrDelete(Entity *); /** - * Removes a thing from the game world. + * Removes a entity from the game world. * @note No update may be in progress. - * @note The thing is not destroyed by this call. + * @note The entity is not destroyed by this call. */ - void remove(Thing *); + void remove(Entity *); /** * Warps a character between places of the game world. @@ -78,7 +78,7 @@ namespace GameState /** * Enqueues a remove event. * @note The event will be executed at end of update. - * @note The thing will be destroyed at that time. + * @note The entity will be destroyed at that time. */ void enqueueRemove(Actor *); |