diff options
| author | Mikko Tiusanen <ams@daug.net> | 2014-11-22 22:17:45 +0200 |
|---|---|---|
| committer | Mikko Tiusanen <ams@daug.net> | 2014-11-22 22:17:45 +0200 |
| commit | b7f1c60eba246d8d87dfb1e3eaf69e4bcb1645ee (patch) | |
| tree | d14e0b1b14114a3ebf7e599df54383f6a56915e1 /src | |
| parent | d2a3f26bc4c0699f3a4bb2a08a3f48ca1ba5d9c6 (diff) | |
| parent | 63393347fe30abf71090be848859be75d46d404b (diff) | |
Merge branch 'master' of github.com:mtiusane/new-edge
Diffstat (limited to 'src')
| -rw-r--r-- | src/cgame/cg_draw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/cgame/cg_draw.c b/src/cgame/cg_draw.c index 95ced55..11bc242 100644 --- a/src/cgame/cg_draw.c +++ b/src/cgame/cg_draw.c @@ -1205,8 +1205,8 @@ static float CG_ChargeProgress( void ) max = LEVEL4_TRAMPLE_CHARGE_MAX; } } - else if( cg.snap->ps.weapon == WP_FLAMER ) + else if( cg.snap->ps.weapon == WP_LUCIFER_CANNON || cg.snap->ps.weapon == WP_FLAMER ) { min = LCANNON_CHARGE_TIME_MIN; max = LCANNON_CHARGE_TIME_MAX; |