Merged MovingObject into the Being class

Also renamed Object to Actor, to make it sound a little less generic.
Cleans up a bit the rather big hierarchy of different object types we
have.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/game-server/npc.cpp b/src/game-server/npc.cpp
index 7e144192..e45692b6 100644
--- a/src/game-server/npc.cpp
+++ b/src/game-server/npc.cpp
@@ -23,7 +23,10 @@
 #include "scripting/script.hpp"
 
 NPC::NPC(const std::string &name, int id, Script *s):
-    Being(OBJECT_NPC, 65535), mScript(s), mID(id), mEnabled(true)
+    Being(OBJECT_NPC),
+    mScript(s),
+    mID(id),
+    mEnabled(true)
 {
     setName(name);
 }