summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2006-06-18 14:57:08 +0000
committerTim Angus <tim@ngus.net>2006-06-18 14:57:08 +0000
commit60d41da2ac6e9c9965e73963522a90aa62863b5d (patch)
tree97b01cfaf0ab32853a1060aca070603bcf8a52f0 /src/game
parent579672760092292b7a9752899010ffa4ac6faf6f (diff)
* Move Mass Driver zoom control to secondary attack
* Remove +zoom and -zoom altogether
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_pmove.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index feac25b1..4afdfaac 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2886,6 +2886,18 @@ static void PM_Weapon( void )
}
break;
+ case WP_MASS_DRIVER:
+ attack1 = pm->cmd.buttons & BUTTON_ATTACK;
+ // attack2 is handled on the client for zooming (cg_view.c)
+
+ if( !attack1 )
+ {
+ pm->ps->weaponTime = 0;
+ pm->ps->weaponstate = WEAPON_READY;
+ return;
+ }
+ break;
+
default:
//by default primary and secondary attacks are allowed
attack1 = pm->cmd.buttons & BUTTON_ATTACK;