summaryrefslogtreecommitdiff
path: root/src/game-server/state.h
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-06 21:36:50 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-04-11 13:43:00 +0200
commitaa04597c5f8bb806996d604699fc8ebff6d53bdd (patch)
tree20e6a79a873605b62c80011fd5c80351f60df6fb /src/game-server/state.h
parentd95fccfca8575d8fb06988e558a338e37776961a (diff)
downloadmanaserv-aa04597c5f8bb806996d604699fc8ebff6d53bdd.tar.gz
manaserv-aa04597c5f8bb806996d604699fc8ebff6d53bdd.tar.bz2
manaserv-aa04597c5f8bb806996d604699fc8ebff6d53bdd.tar.xz
manaserv-aa04597c5f8bb806996d604699fc8ebff6d53bdd.zip
Converted the Character class into a component
A CharacterData was created as a proxy class in order to allow using the old serialization method.
Diffstat (limited to 'src/game-server/state.h')
-rw-r--r--src/game-server/state.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game-server/state.h b/src/game-server/state.h
index e8ed30a8..512e9afd 100644
--- a/src/game-server/state.h
+++ b/src/game-server/state.h
@@ -26,7 +26,7 @@
#include <string>
class Actor;
-class Character;
+class Being;
class Entity;
class ItemClass;
class MapComposite;
@@ -71,7 +71,7 @@ namespace GameState
* @note No update may be in progress.
* @note The character is destroyed, if needed.
*/
- void warp(Character *, MapComposite *, const Point &point);
+ void warp(Being *, MapComposite *, const Point &point);
/**
* Enqueues an insert event.
@@ -90,7 +90,7 @@ namespace GameState
* Enqueues a warp event.
* @note The event will be executed at end of update.
*/
- void enqueueWarp(Character *, MapComposite *, const Point &point);
+ void enqueueWarp(Being *, MapComposite *, const Point &point);
/**
* Says something to an actor.