diff options
| -rw-r--r-- | src/core/entityprojectile.cc | 4 | ||||
| -rw-r--r-- | src/core/entityprojectile.h | 2 | ||||
| -rw-r--r-- | src/game/base/ship.cc | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/src/core/entityprojectile.cc b/src/core/entityprojectile.cc index 0a4e081..108d347 100644 --- a/src/core/entityprojectile.cc +++ b/src/core/entityprojectile.cc @@ -19,7 +19,7 @@ EntityProjectile::EntityProjectile(const Entity *spawn) : EntityDynamic() set_label("projectile"); set_flag(Entity::KeepAlive); set_shape(Entity::Sphere); - set_radius(0.01f); + set_radius(PROJECTILE_RADIUS); set_mass(radius()); projectile_damage = 0.0f; @@ -38,7 +38,7 @@ EntityProjectile::EntityProjectile(std::istream & is) : EntityDynamic(is) set_label("projectile"); set_flag(Entity::KeepAlive); set_shape(Entity::Sphere); - set_radius(0.01f); + set_radius(PROJECTILE_RADIUS); set_mass(radius()); projectile_damage = 0.0f; diff --git a/src/core/entityprojectile.h b/src/core/entityprojectile.h index 2651203..932b082 100644 --- a/src/core/entityprojectile.h +++ b/src/core/entityprojectile.h @@ -12,6 +12,8 @@ namespace core { +const float PROJECTILE_RADIUS = 0.025f; + class EntityProjectile : public core::EntityDynamic { public: diff --git a/src/game/base/ship.cc b/src/game/base/ship.cc index 7ce6d36..e5a5a15 100644 --- a/src/game/base/ship.cc +++ b/src/game/base/ship.cc @@ -928,7 +928,7 @@ void Ship::frame(const unsigned long elapsed) } else if ((weapon->projectile_interval() > 0) && (slot->last_fired() + weapon->projectile_interval() <= core::server()->timestamp())) { // aim - const float projectile_radius = 0.01f; // FIXME this should be defined somewhere + const float projectile_radius = core::PROJECTILE_RADIUS; // FIXME this should be defined somewhere math::Axis projectile_axis(axis() * slot->axis()); math::Vector3f projectile_location(location() + (axis() * slot->location() * modelscale) + projectile_axis.forward() * projectile_radius); |