Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/game.cc8
-rw-r--r--src/game/game.h2
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;