From 6c8446cddb37df732fc9e5fc21f98e31968ce634 Mon Sep 17 00:00:00 2001
From: Stijn Buys <ingar@osirion.org>
Date: Fri, 1 Feb 2008 19:34:47 +0000
Subject: interface cleanup

---
 src/client/client.h | 49 +++++++++++++++++++++++++++++++------------------
 1 file changed, 31 insertions(+), 18 deletions(-)

(limited to 'src/client/client.h')

diff --git a/src/client/client.h b/src/client/client.h
index a25643c..af3e53b 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -7,32 +7,45 @@
 #ifndef __INCLUDED_CLIENT_H__
 #define __INCLUDED_CLIENT_H__
 
-#include "client/console.h"
+// project headers
+#include "client/application.h"
 #include "client/camera.h"
-#include "client/view.h"
+#include "client/console.h"
 #include "client/input.h"
 #include "client/video.h"
+#include "client/view.h"
+
+#include "core/core.h"
+#include "game/game.h"
 
 /// client-side functions to render and control the gameworld
 /** The client namespace contains the necessary functions to
  *  accept input, send it to the game and renders the result
  */
 namespace client {
-	/// initialize the client
-	extern void init();
-	/// run the client
-	extern void run();
-	/// shutdown the client
-	extern void shutdown();
-
-	/// global Video object
-	extern Video video;
-	/// global Input object
-	extern Input input;
-	/// global View object
-	extern View view;
-	/// global Camera object
-	extern Camera camera;
-}
+
+/// global Application instance;
+extern Application application;
+
+/// global Video instance
+extern Video video;
+
+/// global Input instance
+extern Input input;
+
+/// global View instance
+extern View view;
+
+/// global Camera instance
+extern Camera camera;
+
+/// global server Console instance
+extern Console console;
+
+/// global Game instance
+extern game::Game game;
+
+} // namespace client
 
 #endif // __INCLUDED_CLIENT_H__
+
-- 
cgit v1.2.3