summaryrefslogtreecommitdiff
path: root/src/game-server/thing.hpp
diff options
context:
space:
mode:
authorBertram <yohanndotferreiraatorange.fr>2010-05-06 23:09:38 +0200
committerBertram <yohanndotferreiraatorange.fr>2010-05-06 23:09:38 +0200
commit1ef56bda12f9f18f0c91903b330e0422cfd98793 (patch)
treecf220234b114f9a5787bc76b8b7de61138ca5992 /src/game-server/thing.hpp
parent1e18865bbe99499de1790f70ad91a4abfdc12fe4 (diff)
downloadmanaserv-1ef56bda12f9f18f0c91903b330e0422cfd98793.tar.gz
manaserv-1ef56bda12f9f18f0c91903b330e0422cfd98793.tar.bz2
manaserv-1ef56bda12f9f18f0c91903b330e0422cfd98793.tar.xz
manaserv-1ef56bda12f9f18f0c91903b330e0422cfd98793.zip
Compile-fix for manaserv, post protocol merge.
Please re-merge mana and manamobile to fit the change on actor types.
Diffstat (limited to 'src/game-server/thing.hpp')
-rw-r--r--src/game-server/thing.hpp19
1 files changed, 2 insertions, 17 deletions
diff --git a/src/game-server/thing.hpp b/src/game-server/thing.hpp
index b6234b92..f1f0df28 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.
*/