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-05 00:10:02 +0000
committerStijn Buys <ingar@osirion.org>2008-02-05 00:10:02 +0000
commit95ca0e469ef856c0182bb0da411e4417391e3780 (patch)
treea07db9b9d726d175d8305dc3cc5520b8a70f7a73 /src/client/client.h
parentcf61370df80de6dc659dbd9b803c973b300c1b4c (diff)
renamed client and server application objects
cleaned up namespaces
Diffstat (limited to 'src/client/client.h')
-rw-r--r--src/client/client.h26
1 files changed, 3 insertions, 23 deletions
diff --git a/src/client/client.h b/src/client/client.h
index 3b8b78e..7c0b74d 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -7,37 +7,17 @@
#ifndef __INCLUDED_CLIENT_H__
#define __INCLUDED_CLIENT_H__
-// project headers
-#include "client/application.h"
-#include "client/camera.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"
-#include <SDL/SDL.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
- */
+/// client part of the engine
namespace client {
-/// global client Application instance;
-extern Application application;
-
-/// global client Console instance
-extern Console console;
+/// the client main loop
+void main(int count, char **arguments);
/// global client Game instance
extern game::Game game;
-/// current fps
-inline float fps() { return (application.current_fps); }
-
} // namespace client
#endif // __INCLUDED_CLIENT_H__