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-11-12 16:24:17 +0000
committerStijn Buys <ingar@osirion.org>2010-11-12 16:24:17 +0000
commitb460b3193e54b7364bb75ff26ce6f999887e454b (patch)
treed35e4972fd3ee54b9922908e3791a53bae96af14 /src/core/gameserver.cc
parentc0c2a0ccc335b00983bf69b99b7a44505ed24b47 (diff)
moved global entity info type to core::Entity::infotype(),
automatic generation of jumppoint and jumpgate names and descriptions, prepared game code for the seperation of Entity::radius() and Model::radius()
Diffstat (limited to 'src/core/gameserver.cc')
-rw-r--r--src/core/gameserver.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index 5ea6206..7d6fc96 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -130,7 +130,8 @@ GameServer::GameServer() : GameInterface()
server_maxplayerid = 1;
server_startup = application()->timestamp();
- Parser::init();
+ // create the default infotype for entities
+ Entity::set_infotype(new InfoType("entity"));
Physics::init();
@@ -237,7 +238,7 @@ GameServer::~GameServer()
Physics::done();
- Parser::done();
+ Entity::set_infotype(0);
server_instance = 0;
}