diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/Makefile.am | 3 | ||||
| -rw-r--r-- | src/server/main.cc | 16 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/server/Makefile.am b/src/server/Makefile.am index 0859838..c167667 100644 --- a/src/server/Makefile.am +++ b/src/server/Makefile.am @@ -1,6 +1,5 @@ INCLUDES = -I$(top_srcdir)/src METASOURCES = AUTO bin_PROGRAMS = osiriond -osiriond_SOURCES = main.cc timer.cc timer.h -noinst_HEADERS = timer.h +osiriond_SOURCES = console.cc console.h main.cc timer.cc timer.h osiriond_LDADD = $(top_builddir)/src/game/libgame.la diff --git a/src/server/main.cc b/src/server/main.cc index 6f71468..92b2dce 100644 --- a/src/server/main.cc +++ b/src/server/main.cc @@ -4,14 +4,12 @@ the terms and conditions of the GNU General Public License version 2 */ -// C++ headers -#include <iostream> - -// project headers +#include "console.h" +#include "timer.h" +#include "game/game.h" #include "osirion.h" -#include "game/game.h" -#include "timer.h" +#include <iostream> void quit(int status) { @@ -20,8 +18,12 @@ void quit(int status) int main( int argc, char *argv[] ) { + // initialize system console; + server::Console serverconsole; + common::Console::instance = &serverconsole; + const float server_framerate = 1.0f / 20.0f; - std::cout << "The Osirion project " << OSIRION_VERSION << std::endl; + conmesg << "The Osirion project " << OSIRION_VERSION << std::endl; server::Timer timer; // initialize game |