diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-02-24 19:13:27 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-02-24 19:13:27 +0000 |
| commit | 53faab4c1d692fed7c7ecfedea57fc457bf61e80 (patch) | |
| tree | d5dab7709dd4dc5409ab0e62920bb4d62790a90a /src/game/base/game.cc | |
| parent | 0e96454c70e56de5cefa38ab1b5dc46196238d07 (diff) | |
Replaced 'The Osirion Project' with 'Project::OSiRioN' in messages,
added g_collision cflag to facillitate future development,
added ShowOnMap entity flag
Diffstat (limited to 'src/game/base/game.cc')
| -rw-r--r-- | src/game/base/game.cc | 7 |
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) |