diff options
| author | Ben Millwood <thebenmachine@gmail.com> | 2009-10-03 11:42:20 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:15 +0000 |
| commit | c37ba185e89c73bc33e9ac19ee840c5e5ed49bb3 (patch) | |
| tree | 118a6810fe01de509e46ba6dd42f53407310f1ea /src | |
| parent | 3b9eac7bf2528674a5c5670b474029e73a7d2926 (diff) | |
Lcannon primary doesn't scale radius anymore, just uses secondary size
Diffstat (limited to 'src')
| -rw-r--r-- | src/game/g_missile.c | 4 | ||||
| -rw-r--r-- | src/game/tremulous.h | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/game/g_missile.c b/src/game/g_missile.c index e85e7cd4..ebfd4d9d 100644 --- a/src/game/g_missile.c +++ b/src/game/g_missile.c @@ -470,13 +470,13 @@ gentity_t *fire_luciferCannon( gentity_t *self, vec3_t start, vec3_t dir, bolt->target_ent = NULL; // Give the missile a small bounding box - charge = (float)( damage - LCANNON_SECONDARY_DAMAGE ) / LCANNON_DAMAGE; bolt->r.mins[ 0 ] = bolt->r.mins[ 1 ] = bolt->r.mins[ 2 ] = - -LCANNON_SECONDARY_SIZE - charge * LCANNON_SIZE; + -LCANNON_SIZE; bolt->r.maxs[ 0 ] = bolt->r.maxs[ 1 ] = bolt->r.maxs[ 2 ] = -bolt->r.mins[ 0 ]; // Pass the missile charge through + charge = (float)( damage - LCANNON_SECONDARY_DAMAGE ) / LCANNON_DAMAGE; bolt->s.torsoAnim = charge * 255; if( bolt->s.torsoAnim < 0 ) bolt->s.torsoAnim = 0; diff --git a/src/game/tremulous.h b/src/game/tremulous.h index 4e0b3350..b3ed8633 100644 --- a/src/game/tremulous.h +++ b/src/game/tremulous.h @@ -458,10 +458,9 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define LCANNON_RELOAD 0 #define LCANNON_DAMAGE HDM(265) #define LCANNON_RADIUS 150 // primary splash damage radius -#define LCANNON_SIZE 8 // bounding box radius for full charge +#define LCANNON_SIZE 5 // missile bounding box radius #define LCANNON_SECONDARY_DAMAGE HDM(30) #define LCANNON_SECONDARY_RADIUS 75 // secondary splash damage radius -#define LCANNON_SECONDARY_SIZE 5 // bounding box radius #define LCANNON_SECONDARY_SPEED 1400 #define LCANNON_SECONDARY_RELOAD 2000 #define LCANNON_SECONDARY_REPEAT 1000 |