Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2010-11-13 14:25:39 +0000
committerStijn Buys <ingar@osirion.org>2010-11-13 14:25:39 +0000
commit871be21e83502a909620a5bcfcd09e3257ed0518 (patch)
tree8aee5b25fd5c3d43e55e1b92e114acca58c1172a /src/game/base/ship.h
parent650cca5da5e15b9d4a85e7f734515f538b0cc0f3 (diff)
corrected a bug where ship names got erased,
made core::Entity::info() const, added core::Info::find() to get non-const *core::Info pointers
Diffstat (limited to 'src/game/base/ship.h')
-rw-r--r--src/game/base/ship.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/base/ship.h b/src/game/base/ship.h
index 9da45f4..ade7ff7 100644
--- a/src/game/base/ship.h
+++ b/src/game/base/ship.h
@@ -20,7 +20,7 @@ namespace game
class Ship : public core::EntityControlable
{
public:
- Ship(core::Player *owner, ShipModel *shipmodel);
+ Ship(core::Player *owner, const ShipModel *shipmodel);
~Ship();
/// shipmodel
@@ -111,7 +111,7 @@ public:
private:
JumpPoint *find_closest_jumppoint();
- ShipModel *ship_shipmodel;
+ const ShipModel *ship_shipmodel;
float current_target_direction;
float current_target_pitch;