diff options
| author | Tim Angus <tim@ngus.net> | 2003-08-01 02:04:03 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2003-08-01 02:04:03 +0000 |
| commit | 176ad9f581c7612446d6cf04ff06c24b242fbed8 (patch) | |
| tree | 3990e8da1a11d28a4d1631c436d6e2a9717bcfb1 /src/game/bg_pmove.c | |
| parent | beb34e28a4f933107a3fa08a306125a712e885ad (diff) | |
* Jetpack media code
* Various other media issues
* Light flare tweaks
* I can spell, no really I can... (canon->cannon)
* Other stuff I forgot
Diffstat (limited to 'src/game/bg_pmove.c')
| -rw-r--r-- | src/game/bg_pmove.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 16f67a6b..6181e66d 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -2530,7 +2530,7 @@ static void PM_Weapon( void ) } break; - case WP_LUCIFER_CANON: + case WP_LUCIFER_CANNON: attack1 = pm->cmd.buttons & BUTTON_ATTACK; attack2 = pm->cmd.buttons & BUTTON_ATTACK2; attack3 = pm->cmd.buttons & BUTTON_USE_HOLDABLE; @@ -2646,9 +2646,9 @@ static void PM_Weapon( void ) if( !BG_FindInfinteAmmoForWeapon( pm->ps->weapon ) ) { //special case for lCanon - if( pm->ps->weapon == WP_LUCIFER_CANON && attack1 ) + if( pm->ps->weapon == WP_LUCIFER_CANNON && attack1 ) { - ammo -= (int)( ceil( ( (float)pm->ps->stats[ STAT_MISC ] / (float)LCANON_TOTAL_CHARGE ) * 10.0f ) ); + ammo -= (int)( ceil( ( (float)pm->ps->stats[ STAT_MISC ] / (float)LCANNON_TOTAL_CHARGE ) * 10.0f ) ); //stay on the safe side if( ammo < 0 ) |