From 7218e3bd4616d4706090ec47d72845a2bb89c6a3 Mon Sep 17 00:00:00 2001 From: Stijn Buys Date: Sun, 4 May 2008 22:30:49 +0000 Subject: split map reading from models --- src/game/game.cc | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'src/game') diff --git a/src/game/game.cc b/src/game/game.cc index 74aa2d9..31b99c2 100644 --- a/src/game/game.cc +++ b/src/game/game.cc @@ -197,39 +197,6 @@ void Game::init() } worldini.close(); -/* - // the green cube - core::Entity *cube = new core::Entity(core::Entity::Solid & core::Entity::Static); - cube->entity_shape = core::Entity::Cube; - cube->entity_color = Color(0.0f, 0.8f, 0.0f); - cube->entity_location = Vector3f(24.0f, 24.0f, 0.0f); - cube->entity_name ="ccube: Borg cube green"; - cube->entity_modelname = "ccube"; - cube->entity_moduletypeid = cube_enttype; - - // the red cube - cube = new core::Entity(core::Entity::Solid & core::Entity::Static); - cube->entity_shape = core::Entity::Cube; - cube->entity_color = Color(1.0f, 0.0f, 0.0f); - cube->entity_location = Vector3f(16.0f, 16.0f, 0.0f); - cube->entity_name = "cube: Borg cube red"; - cube->entity_modelname = "cube"; - cube->entity_moduletypeid = cube_enttype; - - // the yellow sphere - core::Entity *sphere = new core::Entity(core::Entity::Solid & core::Entity::Static); - sphere->entity_shape = core::Entity::Sphere; - sphere->entity_color = Color(0.8f, 0.8f, 0.0f); - sphere->entity_location = Vector3f(0.0f, 32.0f, 0.0f); - sphere->entity_name ="sphere: The Sphere"; - - // the galactic origin - core::Entity *axis = new core::Entity(core::Entity::Static); - axis->entity_shape = core::Entity::Diamond; - axis->entity_color = Color(1.0f, 1.0f, 0.0f); - axis->entity_location = Vector3f(0, 0, 0); - axis->entity_name = "axis: Origin"; -*/ // read ship model specifications // note: // do not reuse the previous IniFile instance, some gcc versions do not like it @@ -243,7 +210,7 @@ void Game::init() while (shipsini.getline()) { if (shipsini.got_key()) { - if (shipsini.section() == "ship") { + if (shipsini.section().compare("ship") == 0) { if (shipsini.got_key_string("name",shipmodel->shipmodel_name)) { continue; -- cgit v1.2.3