fix involuntary shooting when switching guns while throwing a nade

also: more aggressive middle mouse button

config/menus_settings.cfg

@@ -251,6 +251,7 @@ menuitemkeyinput [Backwards: ]       backward
 menuitemkeyinput [Right: ]           right
 menuitemkeyinput [Attack: ]          attack
 menuitemkeyinput [Special action: ]  altaction
+menuitemkeyinput [Knife attack: ]    key_knifeattack
 menuitemkeyinput [Jump: ]            jump
 menuitemkeyinput [Crouch: ]          crouch
 menuitemkeyinput [Reload: ]          reload

config/resetbinds.cfg

@@ -17,6 +17,7 @@ alias key_domodifier_1 [ domodifier 1 ]
 alias key_domodifier_2 [ domodifier 2 ]
 alias key_escape [ if $connected [ ingamemenu ] [ if (watchingdemo) [ showmenu [Watching demo] ] [ showmenu main ] ] ]
 alias key_getdemo [ if (! (watchingdemo)) getdemo ]
+alias key_knifeattack [ weapon ; attack ]
 alias key_universaldelta_minus [ universaldelta -1 ]
 alias key_universaldelta_plus [ universaldelta 1 ]
 alias key_showmap [ showscores 0; toggleshowmap ]
@@ -70,7 +71,7 @@ _resetallbinds
 bind MOUSE1 attack
 bind MOUSE2 altaction
 editbind MOUSE2 editkey_show_menu
-bind MOUSE3 weapon
+bind MOUSE3 key_knifeattack
 editbind MOUSE3 toggleclosestentpin
 bind MOUSE4 key_universaldelta_plus
 bind MOUSE5 key_universaldelta_minus

source/src/weapon.cpp

@@ -44,6 +44,7 @@ void selectweapon(weapon *w)
     if(!w || !player1->weaponsel->deselectable()) return;
     if(w->selectable())
     {
+        if(player1->attacking && player1->state == CS_ALIVE && player1->weaponsel->type == GUN_GRENADE) attack(false);
         int i = w->type;
         // substitute akimbo
         weapon *akimbo = player1->weapons[GUN_AKIMBO];