interface cleanup

1 files changed, 6 insertions, 42 deletions

diff --git a/src/server/server.cc b/src/server/server.cc
index 69c58b2..ad8960e 100644
--- a/src/server/server.cc
+++ b/src/server/server.cc
@@ -5,52 +5,16 @@
 */
 
 // project headers
-#include "server/server.h"
+
+#include "server/application.h"
+#include "server/console.h"
 #include "game/game.h"
-#include "core/core.h"
-#include "common/common.h"
 
 namespace server {
 
-// private instance of the server console object
-Console console_instance;
-// private instance of the game object
-game::Game game_instance;
-
-void init()
-{
-	// initialize core
-	core::init();
-
-	con_debug << "Initializing server..." << std::endl;
-}
-
-void run()
-{
-
-	const float server_framerate =  1.0f / 20.0f;
-	server::Timer timer;
+Application application;
+Console console;
+game::Game Game;
 
-	timer.mark();
-
-	while(true) {
-		float elapsed = timer.elapsed();
-
-		core::frame(elapsed);
-
-		timer.sleep(server_framerate - elapsed);
-		timer.mark();
-	}
-	
 }
 
-void shutdown() 
-{
-	con_debug << "Shutting down server..." << std::endl;
-	
-	core::shutdown();
-	
-	exit(0);
-}
-
-}