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

1 files changed, 3 insertions, 3 deletions

diff --git a/src/game-server/trigger.h b/src/game-server/trigger.h
index 2a3aa611..fbd41fa8 100644
--- a/src/game-server/trigger.h
+++ b/src/game-server/trigger.h
@@ -21,7 +21,7 @@
 #ifndef TRIGGER_H
 #define TRIGGER_H
 
-#include "game-server/thing.h"
+#include "game-server/entity.h"
 #include "scripting/script.h"
 #include "utils/point.h"
 
@@ -60,14 +60,14 @@ class ScriptAction : public TriggerAction
         int mArg;               // Argument passed to script function (meaning is function-specific)
 };
 
-class TriggerArea : public Thing
+class TriggerArea : public Entity
 {
     public:
         /**
          * Creates a rectangular trigger for a given map.
          */
         TriggerArea(MapComposite *m, const Rectangle &r, TriggerAction *ptr, bool once)
-          : Thing(OBJECT_OTHER, m), mZone(r), mAction(ptr), mOnce(once) {}
+          : Entity(OBJECT_OTHER, m), mZone(r), mAction(ptr), mOnce(once) {}
 
         virtual void update();