diff options
| author | Stijn Buys <ingar@osirion.org> | 2011-05-07 19:38:20 +0000 |
|---|---|---|
| committer | Stijn Buys <ingar@osirion.org> | 2011-05-07 19:38:20 +0000 |
| commit | 1a35dffad7156592c6e983776b470a4108960bd3 (patch) | |
| tree | c4a3f43eac68fea50dafe33ca5b76cb210f99f3a /src/game | |
| parent | 0b3c4498dbb8ef6397c673ccdbf57ed1daeae9db (diff) | |
Removed a number of unused variables to make gcc 4.6 happy.
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/base/game.cc | 2 | ||||
| -rw-r--r-- | src/game/base/ship.cc | 12 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/game/base/game.cc b/src/game/base/game.cc index 89c6baf..4bc94f0 100644 --- a/src/game/base/game.cc +++ b/src/game/base/game.cc @@ -1044,7 +1044,6 @@ bool Game::load_world() con_print << "^BLoading world..." << std::endl; - Faction *faction = 0; core::Zone *zone = 0; std::string label; math::Color color; @@ -1053,7 +1052,6 @@ bool Game::load_world() if (inifile.got_section()) { zone = 0; - faction = 0; if (inifile.got_section("world")) { continue; diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc index 0e4b634..0fa44fb 100644 --- a/src/game/base/ship.cc +++ b/src/game/base/ship.cc @@ -286,7 +286,7 @@ void Ship::set_zone(core::Zone *zone) void Ship::action (btScalar seconds) { - float maxspeed = 0; + //float maxspeed = 0; float engine_force = 0; float turn_force = ship_turn_force; float roll_force = ship_roll_force; @@ -296,25 +296,25 @@ void Ship::action (btScalar seconds) switch (entity_state) { case core::Entity::Normal: engine_force = ship_thrust_force * entity_thrust; - maxspeed = ship_shipmodel->maxspeed() * entity_thrust; + //maxspeed = ship_shipmodel->maxspeed() * entity_thrust; break; case core::Entity::ImpulseInitiate: case core::Entity::Impulse: engine_force = ship_impulse_force; - maxspeed = (Game::g_impulsespeed ? Game::g_impulsespeed->value() * 0.01f : 0.0f); + //maxspeed = (Game::g_impulsespeed ? Game::g_impulsespeed->value() * 0.01f : 0.0f); turn_force *= .5f; roll_force *= .5f; break; case core::Entity::JumpInitiate: case core::Entity::Jump: - maxspeed = 0.0f; + //maxspeed = 0.0f; engine_force = 0.0f; break; case core::Entity::Docked: - maxspeed = 0.0f; + //maxspeed = 0.0f; engine_force = 0.0f; t.setIdentity(); @@ -326,7 +326,7 @@ void Ship::action (btScalar seconds) return; break; default: - maxspeed = 0.0f; + //maxspeed = 0.0f; engine_force = 0.0f; break; } |