summaryrefslogtreecommitdiff
path: root/src/game-server/state.h
diff options
context:
space:
mode:
authorErik Schilling <ablu.erikschilling@googlemail.com>2013-04-11 11:10:47 +0200
committerErik Schilling <ablu.erikschilling@googlemail.com>2013-04-12 14:56:28 +0200
commit9e6a0f98ecb52e04ab5afce817cb1d7fe2076450 (patch)
tree97b6ffedbfbaf09389fe05c1d183471a97740ebb /src/game-server/state.h
parentd7fa7ea64f6bb0bc0b097e4bf1ceb4bd9620d0da (diff)
downloadmanaserv-9e6a0f98ecb52e04ab5afce817cb1d7fe2076450.tar.gz
manaserv-9e6a0f98ecb52e04ab5afce817cb1d7fe2076450.tar.bz2
manaserv-9e6a0f98ecb52e04ab5afce817cb1d7fe2076450.tar.xz
manaserv-9e6a0f98ecb52e04ab5afce817cb1d7fe2076450.zip
Moved Actor into an Component
This was the final step to remove the hierachy with Entity on the top.
Diffstat (limited to 'src/game-server/state.h')
-rw-r--r--src/game-server/state.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/game-server/state.h b/src/game-server/state.h
index becfd597..4f690ad0 100644
--- a/src/game-server/state.h
+++ b/src/game-server/state.h
@@ -25,7 +25,6 @@
#include <string>
-class Actor;
class Entity;
class ItemClass;
class MapComposite;
@@ -76,14 +75,14 @@ namespace GameState
* Enqueues an insert event.
* @note The event will be executed at end of update.
*/
- void enqueueInsert(Actor *);
+ void enqueueInsert(Entity *);
/**
* Enqueues a remove event.
* @note The event will be executed at end of update.
* @note The entity will be destroyed at that time.
*/
- void enqueueRemove(Actor *);
+ void enqueueRemove(Entity *);
/**
* Enqueues a warp event.
@@ -95,12 +94,12 @@ namespace GameState
* Says something to an actor.
* @note passing NULL as source generates a message from "Server:"
*/
- void sayTo(Actor *destination, Actor *source, const std::string &text);
+ void sayTo(Entity *destination, Entity *source, const std::string &text);
/**
* Says something to everything around an actor.
*/
- void sayAround(Actor *, const std::string &text);
+ void sayAround(Entity *, const std::string &text);
/**
* Says something to every player on the server.