Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2013-01-06 21:08:34 +0000
committerStijn Buys <ingar@osirion.org>2013-01-06 21:08:34 +0000
commitd5b69e209b462577e048e3fb93c2e9fe3266f5f9 (patch)
tree2c539bd4362ba73d6157cc94f7c039a0f8128aae /src
parentc92839e5205f008a226ed82d5388e0c858ca7291 (diff)
Increased projectile size to 0.025f.
Diffstat (limited to 'src')
-rw-r--r--src/core/entityprojectile.cc4
-rw-r--r--src/core/entityprojectile.h2
-rw-r--r--src/game/base/ship.cc2
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);