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-01-30 17:32:00 +0000
committerStijn Buys <ingar@osirion.org>2008-01-30 17:32:00 +0000
commita94049b1a43f83d750b9b5dee031c19a6b1fafb0 (patch)
tree8677f67ba0ba0c0bb80b911d3aa0413d7e2a47c0 /src/client/client.cc
parent7b5777160c7615443afc287fbdad6a861d69e36b (diff)
accomodate the new modules
Diffstat (limited to 'src/client/client.cc')
-rw-r--r--src/client/client.cc16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/client/client.cc b/src/client/client.cc
index f146a8f..a94219b 100644
--- a/src/client/client.cc
+++ b/src/client/client.cc
@@ -4,14 +4,14 @@
the terms and conditions of the GNU General Public License version 2
*/
-#include "camera.h"
-#include "view.h"
-#include "video.h"
-#include "input.h"
-#include "console.h"
+#include "client/camera.h"
+#include "client/view.h"
+#include "client/video.h"
+#include "client/input.h"
+#include "client/console.h"
#include "game/game.h"
-#include "osirion.h"
+#include "common/common.h"
#include <SDL/SDL.h>
@@ -26,7 +26,6 @@ Input input;
// private instance of the client console object
Console clientconsole;
-
void quit(int status)
{
SDL_Quit();
@@ -35,9 +34,6 @@ void quit(int status)
void init()
{
- // set clientconsole as the common console object
- common::Console::instance = &clientconsole;
-
// Initialize the video subsystem
video.init();
if (!video.initialized) {