diff options
| author | mtiusane <mtiusane@users.noreply.github.com> | 2014-11-22 22:17:36 +0200 |
|---|---|---|
| committer | mtiusane <mtiusane@users.noreply.github.com> | 2014-11-22 22:17:36 +0200 |
| commit | 63393347fe30abf71090be848859be75d46d404b (patch) | |
| tree | 6eff9d2b19227376f98f409cfcd57e9f6eac579e /src | |
| parent | 69382df33438a83a58645b9912788a47cd24552d (diff) | |
| parent | 65486f97313f6d5c6bb771abe47b7caf7689852a (diff) | |
Merge pull request #15 from enneract/newguns
Revert removal of Lucifer Cannon's charge meter.
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; |