From 4d84c4ffd2c4f25a67b2f094baf6ac81c68ebb07 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Fri, 16 Mar 2012 23:20:38 +0100 Subject: 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 --- src/game-server/spawnarea.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/game-server/spawnarea.cpp') diff --git a/src/game-server/spawnarea.cpp b/src/game-server/spawnarea.cpp index 43e3a93..155d4c0 100644 --- a/src/game-server/spawnarea.cpp +++ b/src/game-server/spawnarea.cpp @@ -31,7 +31,7 @@ struct SpawnAreaEventDispatch : EventDispatch { typedef EventListenerFactory< SpawnArea, &SpawnArea::mSpawnedListener > Factory; - removed = &Factory::create< Thing, &SpawnArea::decrease >::function; + removed = &Factory::create< Entity, &SpawnArea::decrease >::function; } }; @@ -42,7 +42,7 @@ SpawnArea::SpawnArea(MapComposite *map, const Rectangle &zone, int maxBeings, int spawnRate): - Thing(OBJECT_OTHER, map), + Entity(OBJECT_OTHER, map), mSpecy(specy), mSpawnedListener(&spawnAreaEventDispatch), mZone(zone), @@ -125,7 +125,7 @@ void SpawnArea::update() } } -void SpawnArea::decrease(Thing *t) +void SpawnArea::decrease(Entity *t) { --mNumBeings; t->removeListener(&mSpawnedListener); -- cgit