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/monster.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/monster.cpp')
-rw-r--r-- | src/game-server/monster.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/monster.cpp b/src/game-server/monster.cpp index 6bc69b7e..34920b91 100644 --- a/src/game-server/monster.cpp +++ b/src/game-server/monster.cpp @@ -40,8 +40,8 @@ struct MonsterTargetEventDispatch: EventDispatch MonsterTargetEventDispatch() { typedef EventListenerFactory<Monster, &Monster::mTargetListener> Factory; - removed = &Factory::create< Thing, &Monster::forgetTarget >::function; - died = &Factory::create<Thing, &Monster::forgetTarget, Being>::function; + removed = &Factory::create< Entity, &Monster::forgetTarget >::function; + died = &Factory::create<Entity, &Monster::forgetTarget, Being>::function; } }; @@ -376,7 +376,7 @@ int Monster::calculatePositionPriority(Point position, int targetPriority) } } -void Monster::forgetTarget(Thing *t) +void Monster::forgetTarget(Entity *t) { Being *b = static_cast< Being * >(t); mAnger.erase(b); |