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/jumppoint.cc
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/jumppoint.cc')
-rw-r--r--src/game/base/jumppoint.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/game/base/jumppoint.cc b/src/game/base/jumppoint.cc
index 08c7e67..6542b84 100644
--- a/src/game/base/jumppoint.cc
+++ b/src/game/base/jumppoint.cc
@@ -20,6 +20,7 @@ JumpPoint::JumpPoint() : core::EntityDynamic()
// FIXME jumppoints should be harder to find
set_flag(core::Entity::ShowOnMap);
+ set_flag(core::Entity::NonSolid);
get_color().assign(0.0f, 0.8f, 0.8f, 1.0f);
get_color_second().assign(0.6f, 1.0f);
@@ -108,6 +109,7 @@ JumpGate::JumpGate() : JumpPoint()
{
entity_moduletypeid = jumpgate_enttype;
unset_flag(core::Entity::Bright);
+ unset_flag(core::Entity::NonSolid);
set_flag(core::Entity::ShowOnMap);
set_radius(0.0f);
set_state(core::Entity::NoPower);