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-10-17 17:19:03 +0000
committerStijn Buys <ingar@osirion.org>2010-10-17 17:19:03 +0000
commitd6e4c4e7c2b1e28961f1dfe2f25ef96ced60b21b (patch)
tree63744dff093a8b23f65d9c68b922b678805647d9 /src/core/gameserver.cc
parentea6e6bb769d713ac55114c1940626f13e384ebed (diff)
core bullet physics support,
initial vstrafe support
Diffstat (limited to 'src/core/gameserver.cc')
-rw-r--r--src/core/gameserver.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/gameserver.cc b/src/core/gameserver.cc
index 31c6d42..597de33 100644
--- a/src/core/gameserver.cc
+++ b/src/core/gameserver.cc
@@ -14,6 +14,7 @@
#include "core/gameserver.h"
#include "core/loader.h"
#include "core/parser.h"
+#include "core/physics.h"
#include "core/netserver.h"
#include "filesystem/filesystem.h"
#include "sys/sys.h"
@@ -130,6 +131,8 @@ GameServer::GameServer() : GameInterface()
Parser::init();
+ Physics::init();
+
server_module = Loader::init();
if (!server_module) {
@@ -228,8 +231,10 @@ GameServer::~GameServer()
Func::remove("time");
Func::remove("who");
+ Physics::done();
+
Parser::done();
-
+
server_instance = 0;
}
@@ -490,6 +495,8 @@ void GameServer::frame(unsigned long timestamp)
update_clientstate();
}*/
+ Physics::frame(timestamp);
+
if ((Cvar::sv_dedicated->value() || Cvar::sv_private->value())) {
if (core::Cvar::sv_framerate->value()) {
float f = 1000.0f / core::Cvar::sv_framerate->value();