Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/entity.h')
-rw-r--r--src/core/entity.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/core/entity.h b/src/core/entity.h
index ae2585d..1bc93a1 100644
--- a/src/core/entity.h
+++ b/src/core/entity.h
@@ -56,7 +56,7 @@ public:
typedef std::list<MenuDescription *> Menus;
/// create a new entity and add it to the registry
- Entity(const unsigned int flags = 0);
+ Entity();
/// create an entity from stream data
Entity(std::istream & is);
@@ -413,7 +413,7 @@ class EntityDynamic : public Entity
{
public:
/// create a dynamic entity
- EntityDynamic(const unsigned int flags = 0);
+ EntityDynamic();
/// create a dynamic entity from stream data
EntityDynamic(std::istream & is);
@@ -479,8 +479,8 @@ class EntityControlable : public EntityDynamic
{
friend class Player;
public:
- /// create a controlable entity
- EntityControlable(Player *owner, const unsigned int flags = 0);
+ /// server-side constructor, create a controlable entity
+ EntityControlable();
/// create a controlable entity from stream data
EntityControlable(std::istream & is);
@@ -531,6 +531,9 @@ public:
/// receive a server-to-client update from a stream
virtual void receive_server_update(std::istream &is);
+ /// set the player who owns this entity
+ void set_owner(Player *owner);
+
/// set the target thrust
void set_thrust(float thrust);
@@ -591,7 +594,8 @@ private:
class EntityGlobe : public Entity
{
public:
- EntityGlobe(const unsigned int flags = 0);
+ /// server-side constructor
+ EntityGlobe();
EntityGlobe(std::istream & is);
virtual ~EntityGlobe();