Merge branch 'master' into Mario/vaporizer_damage

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / w_machinegun.qc

diff --git a/qcsrc/common/weapons/w_machinegun.qc b/qcsrc/common/weapons/w_machinegun.qc
index 4ff30d69874c71daff0e2257b63822acadb7e6b5..14a59e39892583450992262c11cdff7dd9c92cc0 100644 (file)
--- a/qcsrc/common/weapons/w_machinegun.qc
+++ b/qcsrc/common/weapons/w_machinegun.qc
@@ -246,7 +246,7 @@ float W_MachineGun(float req)
                                self.BUTTON_ATCK = bot_aim(1000000, 0, 0.001, false);
                        else
                                self.BUTTON_ATCK2 = bot_aim(1000000, 0, 0.001, false);
-                       
+
                        return true;
                }
                case WR_THINK:
@@ -298,7 +298,7 @@ float W_MachineGun(float req)
                                        weapon_thinkf(WFRAME_FIRE2, WEP_CVAR(machinegun, first_refire), w_ready);
                                }
                        }
-                       
+
                        return true;
                }
                case WR_INIT:
@@ -385,7 +385,7 @@ float W_MachineGun(float req)
                                        sound(self, CH_SHOTS, "weapons/ric2.wav", VOL_BASE, ATTN_NORM);
                                else if(w_random < 0.2)
                                        sound(self, CH_SHOTS, "weapons/ric3.wav", VOL_BASE, ATTN_NORM);
-                                       
+
                        return true;
                }
                case WR_INIT: