Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/base/game.cc')
-rw-r--r--src/game/base/game.cc7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc
index 23eee3f..29c36d6 100644
--- a/src/game/base/game.cc
+++ b/src/game/base/game.cc
@@ -52,6 +52,7 @@ core::Cvar *Game::g_impulsespeed = 0;
core::Cvar *Game::g_impulseacceleration = 0;
core::Cvar *Game::g_jumppointrange = 0;
core::Cvar *Game::g_devel = 0;
+core::Cvar *Game::g_collision = 0;
core::Module *factory()
{
@@ -307,6 +308,9 @@ Game::Game() : core::Module("Project::OSiRiON", true)
g_devel = core::Cvar::get("g_devel", "0", core::Cvar::Archive);
g_devel->set_info("[bool] enable or disable developer mode");
+
+ g_collision = core::Cvar::get("g_collision", "0", core::Cvar::Archive);
+ g_collision->set_info("[bool] enable or disable collision detection");
}
Game::~Game()
@@ -853,7 +857,8 @@ void Game::frame(float seconds)
// TODO check Module::frame() is execute before are Entity::frame()
// collision
- Collision::frame(seconds);
+ if (g_collision->value())
+ Collision::frame(seconds);
}
void Game::player_connect(core::Player *player)