summaryrefslogtreecommitdiffstats
path: root/src/game-server/actor.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/game-server/actor.h')
-rw-r--r--src/game-server/actor.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/game-server/actor.h b/src/game-server/actor.h
index 758424a..324393d 100644
--- a/src/game-server/actor.h
+++ b/src/game-server/actor.h
@@ -22,7 +22,7 @@
#define ACTOR_H
#include "game-server/map.h"
-#include "game-server/thing.h"
+#include "game-server/entity.h"
#include "utils/point.h"
/**
@@ -44,11 +44,11 @@ enum
* Generic client-visible object. Keeps track of position, size and what to
* update clients about.
*/
-class Actor : public Thing
+class Actor : public Entity
{
public:
- Actor(ThingType type)
- : Thing(type),
+ Actor(EntityType type)
+ : Entity(type),
mMoveTime(0),
mUpdateFlags(0),
mPublicID(65535),