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>2010-09-16 14:12:27 +0000
committerStijn Buys <ingar@osirion.org>2010-09-16 14:12:27 +0000
commit0c509866a37ab47ff0e48d357ca55e31658c37c2 (patch)
tree57f69397ac1b30ce42a3e3fcd19c2fd8ed67d4e0 /src/core/gameserver.cc
parent3392cb739f212aea561eceb1781cd2e10e55c932 (diff)
map info support, initial trade window
Diffstat (limited to 'src/core/gameserver.cc')
-rw-r--r--src/core/gameserver.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index 2e848e0..4181824 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -13,6 +13,7 @@
#include "core/func.h"
#include "core/gameserver.h"
#include "core/loader.h"
+#include "core/parser.h"
#include "core/netserver.h"
#include "filesystem/filesystem.h"
#include "sys/sys.h"
@@ -127,7 +128,10 @@ GameServer::GameServer() : GameInterface()
server_maxplayerid = 1;
server_startup = application()->timestamp();
+ Parser::init();
+
server_module = Loader::init();
+
if (!server_module) {
con_error << "No module loaded.\n";
abort();
@@ -223,6 +227,8 @@ GameServer::~GameServer()
*/
Func::remove("time");
Func::remove("who");
+
+ Parser::done();
server_instance = 0;
}