Compile-fix for manaserv, post protocol merge.

Please re-merge mana and manamobile to fit the change on actor types.

2 files changed, 16 insertions, 24 deletions

diff --git a/src/game-server/thing.hpp b/src/game-server/thing.hpp
index b6234b9..f1f0df2 100644
--- a/src/game-server/thing.hpp
+++ b/src/game-server/thing.hpp
@@ -21,29 +21,14 @@
 #ifndef THING_H
 #define THING_H
 
+#include "protocol.h"
+
 #include <set>
 
 class EventListener;
 class MapComposite;
 
 /**
- * Types of things enumeration.
- */
-enum ThingType
-{
-    OBJECT_ITEM = 0,  /**< A simple item. */
-    OBJECT_ACTOR,     /**< An item that toggle map/quest actions (doors,
-                           switchs, ...) and can speak (map panels). */
-    OBJECT_NPC,       /**< Non-Playable-Character is an actor capable of
-                           movement and maybe actions. */
-    OBJECT_MONSTER,   /**< A monster (moving actor with AI. Should be able to
-                           toggle map/quest actions, too). */
-    OBJECT_CHARACTER, /**< A normal being. */
-    OBJECT_EFFECT,    /**< A effect to be shown */
-    OBJECT_OTHER      /**< Server-only object. */
-};
-
-/**
  * Base class for in-game objects. Knows only its type and the map it resides
  * on. Provides listeners.
  */
diff --git a/src/protocol.h b/src/protocol.h
index 3b92944..9b3e5a1 100644
--- a/src/protocol.h
+++ b/src/protocol.h
@@ -314,17 +314,24 @@ enum AttribmodResponseCode {
 };
 
 // Object type enumeration
-enum {
-    // A simple item
+enum ThingType
+{
+    // A simple item.
     OBJECT_ITEM = 0,
-    // An item that can be activated (doors, switchs, sign, ...)
+    // An item that toggle map/quest actions (doors, switchs, ...)
+    // and can speak (map panels).
     OBJECT_ACTOR,
-    // Non-Playable-Character is an actor capable of movement and maybe actions
+    // Non-Playable-Character is an actor capable of movement and maybe actions.
     OBJECT_NPC,
-    // A monster (moving actor with AI. able to toggle map/quest actions, too)
+    // A monster (moving actor with AI. Should be able to toggle map/quest
+    // actions, too).
     OBJECT_MONSTER,
-    // A player
-    OBJECT_PLAYER
+    // A normal being.
+    OBJECT_CHARACTER,
+    // A effect to be shown.
+    OBJECT_EFFECT,
+    // Server-only object.
+    OBJECT_OTHER
 };
 
 // Moving object flags