Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-11-09 20:08:40 +0000
committerStijn Buys <ingar@osirion.org>2013-11-09 20:08:40 +0000
commite69ce33b0436d0fa9b81e032442026a43cbbbb05 (patch)
tree55a04c6fae3a0409ee7d6f4385d8a4de3efbb8b1 /src/game
parentf1d6e358614d40f72047fe59ee255ea4f475bc9e (diff)
Corrections in the ship print() function.
Diffstat (limited to 'src/game')
-rw-r--r--src/game/base/ship.cc12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc
index b046d9d..5be9a00 100644
--- a/src/game/base/ship.cc
+++ b/src/game/base/ship.cc
@@ -97,16 +97,6 @@ Ship::Ship(core::Player *owner, const ShipModel *shipmodel) : core::EntityContro
if (model()) {
add_slots();
slots()->load(model());
-/*
- for (core::Slots::iterator it = slots()->begin(); it != slots()->end(); it++) {
- // default fire rate: 1 projectile / second
- (*it)->set_projectile_interval(1000);
- (*it)->set_projectile_lifespan(5000);
- (*it)->set_projectile_speed(5.0f);
- (*it)->set_projectile_damage(10.0f);
- (*it)->set_projectile_modelname("laser1");
- }
-*/
}
// menus for docked players
@@ -143,7 +133,7 @@ Ship::~Ship()
void Ship::print() const
{
core::EntityControlable::print();
- con_print << " armor ^B" << armor() << "^N/^B" << maxarmor() << std::endl;
+ con_print << " ^Narmor ^B" << armor() << "^N/^B" << maxarmor() << std::endl;
}
void Ship::func_impulse()