From a94049b1a43f83d750b9b5dee031c19a6b1fafb0 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Wed, 30 Jan 2008 17:32:00 +0000 Subject: accomodate the new modules --- src/client/client.cc | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/client/client.cc') 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 @@ -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) { -- cgit v1.2.3