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>2011-07-12 14:26:09 +0000
committerStijn Buys <ingar@osirion.org>2011-07-12 14:26:09 +0000
commit8c3abbb3c04c6119b8f0ceb546c3aff66703ba14 (patch)
tree975ff9f73ef7841763111a0e0dc7065e34e3cbf7 /src/game/base/shipmodel.h
parentbbbd41ccf4e7501e93689afecab442cb7e60a5de (diff)
Removed Entity::Complex flag: collision models will be used if availble,
removed a number of irrelevant comments.
Diffstat (limited to 'src/game/base/shipmodel.h')
-rw-r--r--src/game/base/shipmodel.h14
1 files changed, 0 insertions, 14 deletions
diff --git a/src/game/base/shipmodel.h b/src/game/base/shipmodel.h
index a576c1d..f790bcd 100644
--- a/src/game/base/shipmodel.h
+++ b/src/game/base/shipmodel.h
@@ -80,11 +80,6 @@ public:
return shipmodel_angular_damping;
}
- /// complex collision
- inline const bool complex_collision() const {
- return shipmodel_complex_collision;
- }
-
/// maximum thrust speed
inline const float maxspeed() const {
return shipmodel_maxspeed;
@@ -196,13 +191,6 @@ protected:
shipmodel_angular_damping = angular_damping;
}
- /**
- * @brief enable collision mesh
- */
- inline void set_complex_collision(const float complex_collision) {
- shipmodel_complex_collision = complex_collision;
- }
-
public:
void generate_info();
@@ -244,8 +232,6 @@ private:
bool shipmodel_jumpdrive;
bool shipmodel_dockable;
- bool shipmodel_complex_collision;
-
const Template *shipmodel_template;
/* --- static ----------------------------------------------------- */