Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/server')
-rw-r--r--src/server/Makefile.am5
-rw-r--r--src/server/server.cc4
-rw-r--r--src/server/server.h5
3 files changed, 2 insertions, 12 deletions
diff --git a/src/server/Makefile.am b/src/server/Makefile.am
index 0b9ba48..0e7bde1 100644
--- a/src/server/Makefile.am
+++ b/src/server/Makefile.am
@@ -4,6 +4,5 @@ noinst_HEADERS = console.h server.h timer.h
noinst_LTLIBRARIES = libserver.la
INCLUDES = -I$(top_srcdir)/src
libserver_la_LDFLAGS = -avoid-version -no-undefined
-libserver_la_LIBADD = $(top_builddir)/src/math/libmath.la \
- $(top_builddir)/src/sys/libsys.la $(top_builddir)/src/filesystem/libfilesystem.la \
- $(top_builddir)/src/core/libcore.la $(top_builddir)/src/game/libgame.la
+libserver_la_LIBADD = $(top_builddir)/src/sys/libsys.la \
+ $(top_builddir)/src/filesystem/libfilesystem.la $(top_builddir)/src/math/libmath.la $(top_builddir)/src/core/libcore.la
diff --git a/src/server/server.cc b/src/server/server.cc
index b065eea..4f7d1e9 100644
--- a/src/server/server.cc
+++ b/src/server/server.cc
@@ -52,10 +52,6 @@ void main(int count, char **arguments)
void Server::init()
{
- // FIXME core should be able to load game.so -
- // force initialization of the game object
- server::game = new game::Game();
-
con_print << "Initializing server..." << std::endl;
core::Application::init();
diff --git a/src/server/server.h b/src/server/server.h
index 29656bd..4691e91 100644
--- a/src/server/server.h
+++ b/src/server/server.h
@@ -7,17 +7,12 @@
#ifndef __INCLUDED_SERVER_H__
#define __INCLUDED_SERVER_H__
-#include "game/game.h"
-
/// contains classes and functions to run a dedicated server
namespace server {
/// the server main loop
void main(int count, char **arguments);
-/// global Game instance
-extern game::Game *game;
-
} // namespace server
#endif // __INCLUDED_SERVER_H__