diff options
Diffstat (limited to 'src/game/game.cc')
| -rw-r--r-- | src/game/game.cc | 28 |
1 files changed, 11 insertions, 17 deletions
diff --git a/src/game/game.cc b/src/game/game.cc index 7f2ad17..2945657 100644 --- a/src/game/game.cc +++ b/src/game/game.cc @@ -18,23 +18,11 @@ namespace game { -Ship ship; -Star star; -bool initialized = false; - -std::string name; // name of the game -std::string label; // label of the game -std::string author; // author of the game - -// sectors in space -std::vector<Sector*> sectors; - void Game::init() { using math::Vector3f; using filesystem::IniFile; - con_print << "Project::OSiRiON " << VERSION << std::endl; con_debug << "Debug messages enabled" << std::endl; // read game.ini @@ -61,7 +49,8 @@ void Game::init() } f.close(); - con_print << "game.ini loaded " << name << " [" << label << "] by " << author << std::endl; + con_print << name << std::endl; + con_print << "by " << author << std::endl; // read world.ini std::string tmp; @@ -108,14 +97,16 @@ void Game::init() star.location = Vector3f(256.0f, 0.0f, 256.0f); ship.location = Vector3f(0,0,0); - // all done, ready to run - initialized = true; + // signal the gameinterface the game is ready + core::GameInterface::init(); + + // test functions + core::cmd << "help" << std::endl; + core::cmd << "test" << std::endl; } void Game::shutdown() { - initialized = false; - // delete every sector object in the sectors vector for (unsigned int n =0; n< sectors.size(); n++) { delete sectors[n]; @@ -123,6 +114,9 @@ void Game::shutdown() } // clear the sectors vector sectors.clear(); + + // signal the gameinterface the game has shutdown + core::GameInterface::shutdown(); } void Game::frame(float elapsed) |