Swapped the internal button bits for use/attack2 as it was causing problems in new engine binaries.

Source/Client/Event.c

@@ -721,7 +721,7 @@ void CSQC_Input_Frame( void ) {
 	}
 	
 	if ( iInputAttack2 == TRUE ) {
-		input_buttons |= INPUT_BUTTON5;
+		input_buttons |= INPUT_BUTTON3;
 	} 
 
 	if ( iInputReload == TRUE ) {
@@ -729,7 +729,7 @@ void CSQC_Input_Frame( void ) {
 	} 
 	
 	if ( iInputUse == TRUE ) {
-		input_buttons |= INPUT_BUTTON3;
+		input_buttons |= INPUT_BUTTON5;
 	} 
 	
 	if ( iInputDuck == TRUE ) {

Source/Globals.h

@@ -327,6 +327,8 @@ float Weapon_GetSpeedM( float fWeapon );
 .vector view_ofs;
 .float maxspeed;
 
+.int iNull;
+
 /*
 =================
 Game_GetMaxSpeed

Source/Server/Defs.h

@@ -133,7 +133,6 @@ int iBombPlanted;
 entity eActivator;
 .void() vUse;
 .int iUsable;
-.int iNull;
 
 // GoldSrc-Rendermode Fields
 .vector rendercolor;

Source/Server/Input.c

@@ -55,7 +55,7 @@ void Input_Handle( void ) {
 		Weapon_Switch( SLOT_GRENADE );
 	} 
 	
-	if ( self.button3 ) {
+	if ( self.button5 ) {
 		Player_UseDown(); 
 	} else {
 		Player_UseUp();
@@ -67,7 +67,7 @@ void Input_Handle( void ) {
 		}
 	} else if ( self.button4 ) {
 		Weapon_Reload( self.weapon );
-	} else if ( self.button5 ) {
+	} else if ( self.button3 ) {
 		Weapon_SecondaryAttack( self.weapon );
 	} else {
 		Weapon_Release();