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-02-13 00:40:59 +0000
committerStijn Buys <ingar@osirion.org>2008-02-13 00:40:59 +0000
commit1f95c377b2abfaa454b1f2298af10956d95ad941 (patch)
tree2715cf49a8de16921775eff0dc1ac0ceace145b2 /src/core/player.h
parent468ab7f566ee493b8c7ff6a95763d99ed2ccc200 (diff)
split client from game module
Diffstat (limited to 'src/core/player.h')
-rw-r--r--src/core/player.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/core/player.h b/src/core/player.h
index e5ff396..1f63d63 100644
--- a/src/core/player.h
+++ b/src/core/player.h
@@ -1,5 +1,5 @@
/*
- core/clientstate.h
+ core/player.h
This file is part of the Osirion project and is distributed under
the terms of the GNU General Public License version 2.
*/
@@ -7,9 +7,15 @@
#ifndef __INCLUDED_CORE_PLAYER_H__
#define __INCLUDED_CORE_PLAYER_H__
-#include "core/core.h"
+namespace core
+{
+class Player;
+}
+
+#include "core/entity.h"
#include <string>
+
namespace core
{
@@ -27,6 +33,9 @@ public:
/// dirty state
bool dirty;
+
+ /// the entity the Player is currently controling
+ EntityControlable *controled;
};
extern Player localplayer;