diff options
author | Stijn Buys <ingar@osirion.org> | 2008-02-03 18:53:40 +0000 |
---|---|---|
committer | Stijn Buys <ingar@osirion.org> | 2008-02-03 18:53:40 +0000 |
commit | 43b994017a560a2fa97894ebfe121375d6614b6f (patch) | |
tree | bebdf504c283a797707f92d46e7d3ed8b5100a9d /src/game | |
parent | 6011bbb179f72a370411960eafdbbc98e6607f05 (diff) |
basic client console
Diffstat (limited to 'src/game')
-rw-r--r-- | src/game/game.cc | 8 | ||||
-rw-r--r-- | src/game/game.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/game/game.cc b/src/game/game.cc index 2945657..0d79195 100644 --- a/src/game/game.cc +++ b/src/game/game.cc @@ -23,8 +23,6 @@ void Game::init() using math::Vector3f; using filesystem::IniFile; - con_debug << "Debug messages enabled" << std::endl; - // read game.ini IniFile f; f.open("ini/game.ini"); @@ -119,9 +117,11 @@ void Game::shutdown() core::GameInterface::shutdown(); } -void Game::frame(float elapsed) +void Game::frame(float seconds) { - ship.update(elapsed); + GameInterface::frame(seconds); + + ship.update(seconds); } }; // namespace game diff --git a/src/game/game.h b/src/game/game.h index bd9cebb..29f3e1b 100644 --- a/src/game/game.h +++ b/src/game/game.h @@ -31,7 +31,7 @@ public: /// shutdown the game void shutdown(); /// execute one game grame - void frame(float sec); + void frame(float seconds); /// sectors in space std::vector<Sector*> sectors; |