diff options
author | Stijn Buys <ingar@osirion.org> | 2008-01-30 17:36:33 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-01-30 17:36:33 +0000 |
commit | 107ed6e6af67ff81708db22603f626a54c9cb198 (patch) | |
tree | 7aaf7f00a993b8979db02a2ae1c482c4f5d26e65 /src/server/main.cc | |
parent | d584d29ac49182130d643c9221047e0acb5cfa01 (diff) |
accomodate the new modules
Diffstat (limited to 'src/server/main.cc')
-rw-r--r-- | src/server/main.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/server/main.cc b/src/server/main.cc index f49dbc2..ae74471 100644 --- a/src/server/main.cc +++ b/src/server/main.cc @@ -4,10 +4,12 @@ the terms and conditions of the GNU General Public License version 2 */ -#include "console.h" -#include "timer.h" +// project headers +#include "common/common.h" #include "game/game.h" -#include "osirion.h" + +#include "timer.h" +#include "console.h" #include <iostream> @@ -20,7 +22,6 @@ int main( int argc, char *argv[] ) { // initialize system console; server::Console serverconsole; - common::Console::instance = &serverconsole; const float server_framerate = 1.0f / 20.0f; server::Timer timer; |