Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-03-16 14:51:37 +0000
committerStijn Buys <ingar@osirion.org>2008-03-16 14:51:37 +0000
commit7d7b9324f1f0db14648fb9fe32256d7942af77b9 (patch)
treeef2a60c275f22c6b1ab7430a299138597030b581 /src/core/player.h
parent9a7ca1743f0c74042bca4d4903f7e56fe810edce (diff)
somewhat smoother network play, player assets, client pif updates
Diffstat (limited to 'src/core/player.h')
-rw-r--r--src/core/player.h20
1 files changed, 17 insertions, 3 deletions
diff --git a/src/core/player.h b/src/core/player.h
index db6860a..59b18c1 100644
--- a/src/core/player.h
+++ b/src/core/player.h
@@ -7,16 +7,16 @@
#ifndef __INCLUDED_CORE_PLAYER_H__
#define __INCLUDED_CORE_PLAYER_H__
-#include "math/mathlib.h"
-
namespace core
{
class Player;
}
#include "core/entity.h"
+#include "math/mathlib.h"
#include <string>
+#include <list>
namespace core
{
@@ -54,7 +54,7 @@ public:
void recieve_server_update(std::istream &is);
/// serialize player info to a stream
- void serialize_client_update(std::ostream & os) const;
+ void serialize_client_update(std::ostream & os);
/// receive player info from a stream
void recieve_client_update(std::istream &is);
@@ -62,6 +62,18 @@ public:
/// clear all the data
void clear();
+ /// clear assets
+ void clear_assets();
+
+ /// add an asset
+ void add_asset(EntityControlable *entity);
+
+ /// remove an asset
+ void remove_asset(EntityControlable *entity);
+
+ /// remove an asset
+ void remove_asset(unsigned int id);
+
/* -- should actually not be public --*/
// dirty state
@@ -78,6 +90,8 @@ public:
// the entity the Player is currently controling
EntityControlable *player_control;
+
+ std::list<EntityControlable*> assets;
};
}