diff options
| author | Stijn Buys <ingar@osirion.org> | 2009-01-28 21:05:04 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2009-01-28 21:05:04 +0000 |
| commit | 97746cd48fcc68df3c427ab3a0e18b939eb7906f (patch) | |
| tree | 16b6e100d96366a459ee1e9f65ed84e10dc26feb /src/game/base/game.cc | |
| parent | 757a712813a0815fc570784ca15676b90a36326a (diff) | |
seed random generator on startup,
show loader frame on r_restart,
initial collision detection hooks
Diffstat (limited to 'src/game/base/game.cc')
| -rw-r--r-- | src/game/base/game.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc index 07cec0c..23eee3f 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -15,6 +15,7 @@ #include "filesystem/filesystem.h" #include "filesystem/inifile.h" #include "base/game.h" +#include "base/collision.h" #include "base/navpoint.h" #include "base/jumppoint.h" #include "base/planet.h" @@ -848,6 +849,11 @@ void Game::frame(float seconds) { if (!running()) return; + + // TODO check Module::frame() is execute before are Entity::frame() + + // collision + Collision::frame(seconds); } void Game::player_connect(core::Player *player) |