major rewrite of Cvar, Func and Entity

1 files changed, 18 insertions, 24 deletions

diff --git a/src/core/application.h b/src/core/application.h
index 81e6a64..0f4c5fa 100644
--- a/src/core/application.h
+++ b/src/core/application.h
@@ -7,7 +7,7 @@
 #ifndef __INCLUDED_CORE_APPLICATION_H__
 #define __INCLUDED_CORE_APPLICATION_H__
 
-#include "core/cvar.h"
+#include "core/commandbuffer.h"
 #include "core/netserver.h"
 #include "core/netconnection.h"
 #include "core/gameinterface.h"
@@ -15,15 +15,6 @@
 namespace core
 {
 
-/// cvar to indicate dedicated server status
-extern Cvar sv_dedicated;
-
-/// cvar to indicate private server status
-/**
- * A private server is a client with server cababilities.
- */
-extern Cvar sv_private;
-
 /// core interface for the client and server Application classes
 class Application
 {
@@ -40,21 +31,9 @@ public:
 	/// shutdown the application
 	virtual void shutdown();
 	
-	/// run a core frame
-	virtual void frame(float seconds);
-	
 	/// a pointer to the current application instance
 	static Application *instance();
 	
-	/// quit the application
-	virtual void quit(int status);
-	
-	/// start the server or connect to remote host
-	void connect(std::string const &host);
-	
-	/// disconnect from the game module
-	void disconnect();
-	
 	/// time the has been connected, in seconds
 	float time() const;
 	
@@ -73,10 +52,25 @@ public:
 	/// global application object
 	static Application *application_instance;
 
+	/// quit the application without proper shutdown
+	virtual void quit(int status);
+
+	/// start the server or connect to remote host
+	void connect(std::string const &host);
+	
+	/// disconnect from the game module
+	void disconnect();
+
+protected:
+	/// clear all game related objects
+	void clear();
+
+	/// run a core frame
+	virtual void frame(float seconds);
+
 private:
 	/// time the core has been running
-	float 		game_time;
-
+	float 			game_time;
 };
 
 /// pointer to the current ApplicationInterface