major rewrite of Cvar, Func and Entity

1 files changed, 12 insertions, 17 deletions

diff --git a/src/game/game.h b/src/game/game.h
index 7a6348e..f5f0bc0 100644
--- a/src/game/game.h
+++ b/src/game/game.h
@@ -10,7 +10,6 @@
 // project headers
 #include "game/ship.h"
 #include "game/star.h"
-#include "game/sector.h"
 #include "core/core.h"
 #include "sys/sys.h"
 
@@ -24,6 +23,13 @@
 namespace game
 {
 
+// entity type constants
+const unsigned int ship_enttype = 256;
+const unsigned int star_enttype = 257;
+const unsigned int cube_enttype = 258;
+const unsigned int sphere_enttype = 259;
+const unsigned int axis_enttype = 260;
+
 class Game : public core::GameInterface {
 public:
 	Game();
@@ -31,31 +37,20 @@ public:
 
 	/// initialize the game
 	bool init();
+
 	/// shutdown the game
 	void shutdown();
+
 	/// execute one game grame
 	void frame(float seconds);
 
 	/// is called when a player connects
-	void player_connect(core::Player &player);
+	void player_connect(core::Player *player);
 
 	/// is called when a player disconnects
-	void player_disconnect(core::Player &player);
-
-	/// sectors in space 
-	std::vector<Sector*> sectors;
-	
-private:
-	std::string label;
-	std::string author;
-};
+	void player_disconnect(core::Player *player);
 
-// entity type constants
-const unsigned int ship_enttype = 256;
-const unsigned int star_enttype = 257;
-const unsigned int cube_enttype = 258;
-const unsigned int sphere_enttype = 259;
-const unsigned int axis_enttype = 260;
+};
 
 }