Merge remote branch 'origin/master' into samual/balance

diff --git a/balance25.cfg b/balance25.cfg
index 64ad2b9603d012a8c2dadf83bb7f11e3c3b57e80..81381f4638cbc21084ac14e196e476554331e121 100644 (file)
--- a/balance25.cfg
+++ b/balance25.cfg
@@ -697,6 +697,7 @@ set g_balance_tuba_damage 5
 set g_balance_tuba_edgedamage 0
 set g_balance_tuba_radius 200
 set g_balance_tuba_force 40
+set g_balance_tuba_pitchstep 6
 // }}}
 // {{{ fireball
 set g_balance_fireball_primary_ammo 40

diff --git a/balanceFruit.cfg b/balanceFruit.cfg
index 64935cf29a794334bc91ede9d6f302bf7994a7a5..9e73743e9d6bf5a695c860dad883467d0c4ad8f3 100644 (file)
--- a/balanceFruit.cfg
+++ b/balanceFruit.cfg
@@ -697,6 +697,7 @@ set g_balance_tuba_damage 5
 set g_balance_tuba_edgedamage 0
 set g_balance_tuba_radius 200
 set g_balance_tuba_force 40
+set g_balance_tuba_pitchstep 6
 // }}}
 // {{{ fireball
 set g_balance_fireball_primary_ammo 40

diff --git a/balanceLeeStricklin.cfg b/balanceLeeStricklin.cfg
index 3908f5c80b8943c95aa92d0af2597a640923a988..b73360f204f479af25598a4ecb83559a3abd4a94 100644 (file)
--- a/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@ -697,6 +697,7 @@ set g_balance_tuba_damage 5
 set g_balance_tuba_edgedamage 0
 set g_balance_tuba_radius 200
 set g_balance_tuba_force 40
+set g_balance_tuba_pitchstep 6
 // }}}
 // {{{ fireball
 set g_balance_fireball_primary_ammo 5

diff --git a/balanceXonotic.cfg b/balanceXonotic.cfg
index f41680c1e0d199fdca10aee794c550ec1ec00269..6d308adfc76e53761daa874e97683c36574e0115 100644 (file)
--- a/balanceXonotic.cfg
+++ b/balanceXonotic.cfg
@@ -697,6 +697,7 @@ set g_balance_tuba_damage 5
 set g_balance_tuba_edgedamage 0
 set g_balance_tuba_radius 200
 set g_balance_tuba_force 40
+set g_balance_tuba_pitchstep 6
 // }}}
 // {{{ fireball // this is a superweapon -- lets make it behave as one. 
 set g_balance_fireball_primary_ammo 20

diff --git a/balancetZork.cfg b/balancetZork.cfg
index 00c33085a67dc8e71f9e3055f4a900c19e91a6cc..fd229feb9f394aa8157e749d210ab8cd0b751e57 100644 (file)
--- a/balancetZork.cfg
+++ b/balancetZork.cfg
@@ -696,6 +696,7 @@ set g_balance_tuba_damage 5
 set g_balance_tuba_edgedamage 0
 set g_balance_tuba_radius 200
 set g_balance_tuba_force 40
+set g_balance_tuba_pitchstep 6
 // }}}
 // {{{ fireball
 set g_balance_fireball_primary_ammo 40

diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh
index 8f3372a6c821726040637f3abdc07d8e351a21f3..7451ee7c300a13b54d9f0bb56f1898798434d23e 100644 (file)
--- a/qcsrc/client/autocvars.qh
+++ b/qcsrc/client/autocvars.qh
@@ -121,6 +121,7 @@ float autocvar_g_balance_damagepush_speedfactor;
 float autocvar_g_balance_tuba_attenuation;
 float autocvar_g_balance_tuba_fadetime;
 float autocvar_g_balance_tuba_volume;
+float autocvar_g_balance_tuba_pitchstep;
 float autocvar_g_warmup_limit;
 var float autocvar_g_waypointsprite_uppercase = 1;
 var float autocvar_g_waypointsprite_alpha = 1;

diff --git a/qcsrc/client/tuba.qc b/qcsrc/client/tuba.qc
index 04114d324ab4b9c31590b9c9056bf15f9d71f790..379f9c675057222e439e4d2077b1a67fb2a4216f 100644 (file)
--- a/qcsrc/client/tuba.qc
+++ b/qcsrc/client/tuba.qc
@@ -1,6 +1,77 @@
-#define TUBA_STARTNOTE(n) strcat((checkextension("DP_SND_SETPARAMS") ? "weapons/tuba_loopnote" : "weapons/tuba_note"), ftos(n), ".wav")
-.float cnt; // note
+#define TUBA_MIN -18
+#define TUBA_MAX  27
+
+#define TUBA_STARTNOTE(n) strcat("weapons/tuba_loopnote", ftos(n), ".wav")
+.float note; // note
 .float attenuate; // if set, attenuate it
+.float cnt; // current volume
+.float count; // initial volume
+
+float Tuba_PitchStep;
+
+void tubasound(entity e, float restart)
+{
+       string snd1;
+
+       snd1 = string_null;
+
+       if(Tuba_PitchStep)
+       {
+               string snd2;
+               float f1, f2;
+               float p1, p2;
+               float m;
+
+               f1 = 1;
+               p1 = 1;
+               snd2 = string_null;
+               f2 = 0;
+               p2 = 1;
+
+               m = mod(e.note, Tuba_PitchStep);
+               if(m)
+               {
+                       if(e.note - m < TUBA_MIN)
+                       {
+                               if(restart)
+                                       snd1 = TUBA_STARTNOTE(e.note - m + Tuba_PitchStep);
+                               p1 = pow(2.0, (m - Tuba_PitchStep) / 12.0);
+                       }
+                       else if(e.note - m + Tuba_PitchStep > TUBA_MAX)
+                       {
+                               if(restart)
+                                       snd1 = TUBA_STARTNOTE(e.note - m);
+                               p1 = pow(2.0, m / 12.0);
+                       }
+                       else
+                       {
+                               if(restart)
+                                       snd1 = TUBA_STARTNOTE(e.note - m);
+                               f1 = 1 - m / Tuba_PitchStep;
+                               p1 = pow(2.0, m / 12.0);
+                               if(restart)
+                                       snd2 = TUBA_STARTNOTE(e.note - m + Tuba_PitchStep);
+                               f2 = m / Tuba_PitchStep;
+                               p2 = pow(2.0, (m - Tuba_PitchStep) / 12.0);
+                       }
+               }
+               else
+               {
+                       if(restart)
+                               snd1 = TUBA_STARTNOTE(e.note);
+               }
+
+               sound7(e, CH_TUBA, snd1, e.cnt * f1, e.attenuate * autocvar_g_balance_tuba_attenuation, 100 * p1, 0);
+               if(f2)
+                       sound7(e.enemy, CH_TUBA, snd2, e.cnt * f2, e.attenuate * autocvar_g_balance_tuba_attenuation, 100 * p2, 0);
+       }
+       else
+       {
+               if(restart)
+                       snd1 = TUBA_STARTNOTE(e.note);
+               sound(e, CH_TUBA, snd1, e.cnt, e.attenuate * autocvar_g_balance_tuba_attenuation);
+       }
+}
 
 void Ent_TubaNote_Think()
 {
@@ -13,22 +84,26 @@ void Ent_TubaNote_Think()
        self.nextthink = time;
        if(self.cnt <= 0)
        {
-               sound(self, CH_SHOTS_SINGLE, "misc/null.wav", 0, 0);
+               sound(self, CH_TUBA, "misc/null.wav", 0, 0);
+               if(self.enemy)
+               {
+                       sound(self.enemy, CH_TUBA, "misc/null.wav", 0, 0);
+                       remove(self.enemy);
+               }
                remove(self);
        }
        else
-               sound(self, CH_SHOTS_SINGLE, "", self.cnt, self.attenuate * autocvar_g_balance_tuba_attenuation);
+       {
+               tubasound(self, 0);
+       }
 }
 
 void Ent_TubaNote_UpdateSound()
 {
        self.enemy.cnt = bound(0, VOL_BASE * autocvar_g_balance_tuba_volume, 1);
        self.enemy.count = self.enemy.cnt;
-#ifdef PITCHSHIFT
-       sound7(self.enemy, CH_SHOTS_SINGLE, TUBA_STARTNOTE(0), self.enemy.cnt, self.enemy.attenuate * autocvar_g_balance_tuba_attenuation, 100 * pow(2.0, self.cnt / 12.0), 0);
-#else
-       sound(self.enemy, CH_SHOTS_SINGLE, TUBA_STARTNOTE(self.cnt), self.enemy.cnt, self.enemy.attenuate * autocvar_g_balance_tuba_attenuation);
-#endif
+       self.enemy.note = self.note;
+       tubasound(self.enemy, 1);
 }
 
 void Ent_TubaNote_StopSound()
@@ -42,13 +117,18 @@ void Ent_TubaNote(float bIsNew)
        float f, n;
        f = ReadByte();
        n = floor(f / 2) - 42;
-       if(n != self.cnt || bIsNew)
+       if(n != self.note || bIsNew)
                if(self.enemy)
                        Ent_TubaNote_StopSound();
        if(!self.enemy)
        {
                self.enemy = spawn();
                self.enemy.classname = "tuba_note";
+               if(Tuba_PitchStep)
+               {
+                       self.enemy.enemy = spawn();
+                       self.enemy.enemy.classname = "tuba_note_2";
+               }
                bIsNew = TRUE;
        }
        if(f & 1)
@@ -58,6 +138,8 @@ void Ent_TubaNote(float bIsNew)
                self.enemy.origin_z = ReadCoord();
                setorigin(self.enemy, self.enemy.origin);
                self.enemy.attenuate = ReadByte();
+               if(self.enemy.enemy)
+                       setorigin(self.enemy.enemy, self.enemy.origin);
        }
        self.think = Ent_TubaNote_StopSound;
        self.entremove = Ent_TubaNote_StopSound;
@@ -65,7 +147,7 @@ void Ent_TubaNote(float bIsNew)
        self.enemy.nextthink = time + 10;
        if(bIsNew)
        {
-               self.cnt = n;
+               self.note = n;
                Ent_TubaNote_UpdateSound();
        }
 }
@@ -73,13 +155,18 @@ void Ent_TubaNote(float bIsNew)
 void Tuba_Precache()
 {
        float i;
-#ifdef PITCHSHIFT
-       precache_sound(TUBA_STARTNOTE(0));
-#else
-       for(i = -18; i <= +27; ++i)
+       Tuba_PitchStep = autocvar_g_balance_tuba_pitchstep;
+       if(Tuba_PitchStep)
+       {
+               if(!checkextension("DP_SND_SOUND7_WIP2") && !checkextension("DP_SND_SOUND7"))
+               {
+                       print("^1NOTE:^7 requested pitch shifting, but not supported by this engine build\n");
+                       Tuba_PitchStep = 0;
+               }
+       }
+       for(i = TUBA_MIN; i <= TUBA_MAX; ++i)
        {
-               precache_sound(TUBA_STARTNOTE(i));
+               if(!Tuba_PitchStep || (mod(i, Tuba_PitchStep) == 0))
+                       precache_sound(TUBA_STARTNOTE(i));
        }
-#endif
-       //precache_sound(""); // we want to change volume of existing sounds
 }

diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh
index fe5f9bcd24ea137c4725726344459305501f179c..ebad7a6f045135c320a26046f94bf26245a034d6 100644 (file)
--- a/qcsrc/common/constants.qh
+++ b/qcsrc/common/constants.qh
@@ -442,6 +442,7 @@ float CH_WEAPON_B = 5; // only on players and entities
 float CH_PAIN = 6; // only on players and csqc
 float CH_PAIN_SINGLE = 6; // only on players and csqc
 float CH_PLAYER = 7; // only on players and entities
+float CH_TUBA = 5; // only on csqc
 #else
 float CH_INFO = 0;
 float CH_TRIGGER = -3;
@@ -457,6 +458,7 @@ float CH_WEAPON_B = -1;
 float CH_PAIN = -6;
 float CH_PAIN_SINGLE = 6;
 float CH_PLAYER = -7;
+float CH_TUBA = 5;
 #endif
 
 float  ATTN_NONE                               = 0;

diff --git a/qcsrc/common/util-pre.qh b/qcsrc/common/util-pre.qh
index f5633ab3f31dec7546438633407c4feb6edede7a..e61d57fb65e8721660aa369acb81628e20f9abd9 100644 (file)
--- a/qcsrc/common/util-pre.qh
+++ b/qcsrc/common/util-pre.qh
@@ -2,6 +2,6 @@
 #pragma flag enable lo
 
 #ifndef NOCOMPAT
-# define WORKAROUND_XON010
-# define COMPAT_XON010_CHANNELS
+//# define WORKAROUND_XON010
+//# define COMPAT_XON010_CHANNELS
 #endif

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index 69d6af6b01898b0d3370f9217d52a3824ede7ce1..f85c2877cc6f8c82e44be48ed91582eb634eea20 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -87,7 +87,7 @@ void XonoticAudioSettingsTab_fill(entity me)
        me.TR(me);
                me.TDempty(me, 0.2);
                s = makeXonoticDecibelsSlider(-20, 0, 0.5, "snd_channel1volume");
-               makeMulti(s, "snd_channel5volume"); // legacy
+               makeMulti(s, "snd_channel5volume"); // @!#%'n Tuba
                me.TD(me, 1, 0.8, e = makeXonoticSliderCheckBox(-1000000, 1, s, _("Weapons:")));
                me.TD(me, 1, 2, s);
                setDependentStringNotEqual(e, "mastervolume", "0");

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 7adab90f38cac27a90126d7e3fc3b460c45358ce..bddb5933233ba91f7d422a85820852276344722e 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -1050,8 +1050,6 @@ void PutClientInServer (void)
                        self.killcount = 0;
                }
 
-               self.cnt = WEP_LASER;
-
                CL_SpawnWeaponentity();
                self.alpha = default_player_alpha;
                self.colormod = '1 1 1' * autocvar_g_player_brightness;
@@ -1110,7 +1108,7 @@ void PutClientInServer (void)
                MUTATOR_CALLHOOK(PlayerSpawn);
 
                self.switchweapon = w_getbestweapon(self);
-               self.cnt = self.switchweapon;
+               self.cnt = -1; // W_LastWeapon will not complain
                self.weapon = 0;
                self.weaponname = "";
                self.switchingweapon = 0;

diff --git a/qcsrc/server/cl_impulse.qc b/qcsrc/server/cl_impulse.qc
index 939b6d2580b67a98b00b4cd3cf1590024922d2e6..9e211e5f504086be15b3c2bd7361262b946349fc 100644 (file)
--- a/qcsrc/server/cl_impulse.qc
+++ b/qcsrc/server/cl_impulse.qc
@@ -70,7 +70,7 @@ void ImpulseCommands (void)
                                        W_NextWeapon (0);
                                        break;
                                case 11:
-                                       W_SwitchWeapon (self.cnt); // previously used
+                                       W_LastWeapon();
                                        break;
                                case 12:
                                        W_PreviousWeapon (0);

diff --git a/qcsrc/server/cl_weapons.qc b/qcsrc/server/cl_weapons.qc
index fe678961848c54692bfc3e51250402b155cca1be..f0981f5e29cac8bc88e73893d7cf3579b3c2de63 100644 (file)
--- a/qcsrc/server/cl_weapons.qc
+++ b/qcsrc/server/cl_weapons.qc
@@ -137,6 +137,15 @@ void W_PreviousWeapon(float list)
                W_CycleWeapon(self.cvar_cl_weaponpriority, +1);
 }
 
+// previously used if exists and has ammo, (second) best otherwise
+void W_LastWeapon()
+{
+       if(client_hasweapon(self, self.cnt, TRUE, FALSE))
+               W_SwitchWeapon(self.cnt);
+       else
+               W_SwitchToOtherWeapon(self);
+}
+
 float w_getbestweapon(entity e)
 {
        return W_GetCycleWeapon(e, e.cvar_cl_weaponpriority, 0, -1, FALSE, TRUE);

diff --git a/qcsrc/server/g_hook.qc b/qcsrc/server/g_hook.qc
index 76faad923281b026a45773f292bfc91854f78789..4f655ca5738220c1dc75da1c95849f347b2cef68 100644 (file)
--- a/qcsrc/server/g_hook.qc
+++ b/qcsrc/server/g_hook.qc
@@ -296,8 +296,11 @@ void FireGrapplingHook (void)
        if((arena_roundbased && time < warmup) || (time < game_starttime))
                return;
 
-    if(self.freezetag_frozen)
-        return;
+  if(self.freezetag_frozen)
+               return;
+       
+       if(self.vehicle)
+               return;
 
        makevectors(self.v_angle);
 

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index d9d77b5f5211957f539c4ee41b1057beec0980a4..6006dcf92edb6f0e2acf0bf3094211e1e4756e39 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -428,6 +428,8 @@ void vehicles_enter()
     if(self.team)
     if(self.team != other.team)
         return;
+        
+    RemoveGrapplingHook(other);
 
     self.vehicle_ammo1   = 0;
     self.vehicle_ammo2   = 0;

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 5e034acb908f9bfe6b1b9a085b8c4dd10dd17a24..fa52a6e0dfb6ad2f7877538874af8333eefb2621 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -3,6 +3,7 @@ REGISTER_WEAPON(LASER, w_laser, 0, 1, WEP_FLAG_NORMAL | WEP_FLAG_RELOADABLE | WE
 #else
 #ifdef SVQC
 void(float imp) W_SwitchWeapon;
+void() W_LastWeapon;
 
 void W_Laser_Touch (void)
 {
@@ -259,7 +260,7 @@ float w_laser(float req)
                        else
                        {
                                if(self.switchweapon == WEP_LASER) // don't do this if already switching
-                                       W_SwitchWeapon (self.cnt);
+                                       W_LastWeapon();
                        }
                }
        }

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index 7071ed706bd8ffa483eb8ed364e567f0da45efbf..c108ba3cfa1707f3b69ea2135a93c4c92e58cbbd 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -409,6 +409,8 @@ void Seeker_Tag_Touch()
        vector org2;
        entity e;
        
+       PROJECTILE_TOUCH;
+
        dir     = normalize (self.realowner.origin - self.origin);
        org2    = findbetterlocation (self.origin, 8);
 

diff --git a/sound/weapons/tuba_note-1.ogg b/sound/weapons/tuba_note-1.ogg
deleted file mode 100644 (file)
index 2539692..0000000
Binary files a/sound/weapons/tuba_note-1.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-10.ogg b/sound/weapons/tuba_note-10.ogg
deleted file mode 100644 (file)
index 254a7f6..0000000
Binary files a/sound/weapons/tuba_note-10.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-11.ogg b/sound/weapons/tuba_note-11.ogg
deleted file mode 100644 (file)
index d9b0598..0000000
Binary files a/sound/weapons/tuba_note-11.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-12.ogg b/sound/weapons/tuba_note-12.ogg
deleted file mode 100644 (file)
index 855bb22..0000000
Binary files a/sound/weapons/tuba_note-12.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-13.ogg b/sound/weapons/tuba_note-13.ogg
deleted file mode 100644 (file)
index 082ab0b..0000000
Binary files a/sound/weapons/tuba_note-13.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-14.ogg b/sound/weapons/tuba_note-14.ogg
deleted file mode 100644 (file)
index 06a6c47..0000000
Binary files a/sound/weapons/tuba_note-14.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-15.ogg b/sound/weapons/tuba_note-15.ogg
deleted file mode 100644 (file)
index ecbbdff..0000000
Binary files a/sound/weapons/tuba_note-15.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-16.ogg b/sound/weapons/tuba_note-16.ogg
deleted file mode 100644 (file)
index 990d4fa..0000000
Binary files a/sound/weapons/tuba_note-16.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-17.ogg b/sound/weapons/tuba_note-17.ogg
deleted file mode 100644 (file)
index 0d6277c..0000000
Binary files a/sound/weapons/tuba_note-17.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-18.ogg b/sound/weapons/tuba_note-18.ogg
deleted file mode 100644 (file)
index d065eb9..0000000
Binary files a/sound/weapons/tuba_note-18.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-2.ogg b/sound/weapons/tuba_note-2.ogg
deleted file mode 100644 (file)
index b91b5b7..0000000
Binary files a/sound/weapons/tuba_note-2.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-3.ogg b/sound/weapons/tuba_note-3.ogg
deleted file mode 100644 (file)
index 94a56cb..0000000
Binary files a/sound/weapons/tuba_note-3.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-4.ogg b/sound/weapons/tuba_note-4.ogg
deleted file mode 100644 (file)
index 023a7d3..0000000
Binary files a/sound/weapons/tuba_note-4.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-5.ogg b/sound/weapons/tuba_note-5.ogg
deleted file mode 100644 (file)
index 25ff35b..0000000
Binary files a/sound/weapons/tuba_note-5.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-6.ogg b/sound/weapons/tuba_note-6.ogg
deleted file mode 100644 (file)
index 8bff99a..0000000
Binary files a/sound/weapons/tuba_note-6.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-7.ogg b/sound/weapons/tuba_note-7.ogg
deleted file mode 100644 (file)
index 3cc7f93..0000000
Binary files a/sound/weapons/tuba_note-7.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-8.ogg b/sound/weapons/tuba_note-8.ogg
deleted file mode 100644 (file)
index 23f5410..0000000
Binary files a/sound/weapons/tuba_note-8.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note-9.ogg b/sound/weapons/tuba_note-9.ogg
deleted file mode 100644 (file)
index c15291c..0000000
Binary files a/sound/weapons/tuba_note-9.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note0.ogg b/sound/weapons/tuba_note0.ogg
deleted file mode 100644 (file)
index 64d73c4..0000000
Binary files a/sound/weapons/tuba_note0.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note1.ogg b/sound/weapons/tuba_note1.ogg
deleted file mode 100644 (file)
index d0b26e9..0000000
Binary files a/sound/weapons/tuba_note1.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note10.ogg b/sound/weapons/tuba_note10.ogg
deleted file mode 100644 (file)
index e5e8157..0000000
Binary files a/sound/weapons/tuba_note10.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note11.ogg b/sound/weapons/tuba_note11.ogg
deleted file mode 100644 (file)
index 0421399..0000000
Binary files a/sound/weapons/tuba_note11.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note12.ogg b/sound/weapons/tuba_note12.ogg
deleted file mode 100644 (file)
index a0139f4..0000000
Binary files a/sound/weapons/tuba_note12.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note13.ogg b/sound/weapons/tuba_note13.ogg
deleted file mode 100644 (file)
index b5794c3..0000000
Binary files a/sound/weapons/tuba_note13.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note14.ogg b/sound/weapons/tuba_note14.ogg
deleted file mode 100644 (file)
index ae414fa..0000000
Binary files a/sound/weapons/tuba_note14.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note15.ogg b/sound/weapons/tuba_note15.ogg
deleted file mode 100644 (file)
index 6193dc7..0000000
Binary files a/sound/weapons/tuba_note15.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note16.ogg b/sound/weapons/tuba_note16.ogg
deleted file mode 100644 (file)
index a7c3d64..0000000
Binary files a/sound/weapons/tuba_note16.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note17.ogg b/sound/weapons/tuba_note17.ogg
deleted file mode 100644 (file)
index ce94216..0000000
Binary files a/sound/weapons/tuba_note17.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note18.ogg b/sound/weapons/tuba_note18.ogg
deleted file mode 100644 (file)
index 47f9bc1..0000000
Binary files a/sound/weapons/tuba_note18.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note19.ogg b/sound/weapons/tuba_note19.ogg
deleted file mode 100644 (file)
index d51d714..0000000
Binary files a/sound/weapons/tuba_note19.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note2.ogg b/sound/weapons/tuba_note2.ogg
deleted file mode 100644 (file)
index 4ee01b0..0000000
Binary files a/sound/weapons/tuba_note2.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note20.ogg b/sound/weapons/tuba_note20.ogg
deleted file mode 100644 (file)
index 8598e49..0000000
Binary files a/sound/weapons/tuba_note20.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note21.ogg b/sound/weapons/tuba_note21.ogg
deleted file mode 100644 (file)
index 42e4d05..0000000
Binary files a/sound/weapons/tuba_note21.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note22.ogg b/sound/weapons/tuba_note22.ogg
deleted file mode 100644 (file)
index 40c9e64..0000000
Binary files a/sound/weapons/tuba_note22.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note23.ogg b/sound/weapons/tuba_note23.ogg
deleted file mode 100644 (file)
index 81e2215..0000000
Binary files a/sound/weapons/tuba_note23.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note24.ogg b/sound/weapons/tuba_note24.ogg
deleted file mode 100644 (file)
index 8dafb9b..0000000
Binary files a/sound/weapons/tuba_note24.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note25.ogg b/sound/weapons/tuba_note25.ogg
deleted file mode 100644 (file)
index 0ded294..0000000
Binary files a/sound/weapons/tuba_note25.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note26.ogg b/sound/weapons/tuba_note26.ogg
deleted file mode 100644 (file)
index 39a7401..0000000
Binary files a/sound/weapons/tuba_note26.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note27.ogg b/sound/weapons/tuba_note27.ogg
deleted file mode 100644 (file)
index 6c87882..0000000
Binary files a/sound/weapons/tuba_note27.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note3.ogg b/sound/weapons/tuba_note3.ogg
deleted file mode 100644 (file)
index 3057d39..0000000
Binary files a/sound/weapons/tuba_note3.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note4.ogg b/sound/weapons/tuba_note4.ogg
deleted file mode 100644 (file)
index 36e22c4..0000000
Binary files a/sound/weapons/tuba_note4.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note5.ogg b/sound/weapons/tuba_note5.ogg
deleted file mode 100644 (file)
index 08c3c00..0000000
Binary files a/sound/weapons/tuba_note5.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note6.ogg b/sound/weapons/tuba_note6.ogg
deleted file mode 100644 (file)
index 2db0871..0000000
Binary files a/sound/weapons/tuba_note6.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note7.ogg b/sound/weapons/tuba_note7.ogg
deleted file mode 100644 (file)
index 89776e1..0000000
Binary files a/sound/weapons/tuba_note7.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note8.ogg b/sound/weapons/tuba_note8.ogg
deleted file mode 100644 (file)
index 0ebea71..0000000
Binary files a/sound/weapons/tuba_note8.ogg and /dev/null differ

diff --git a/sound/weapons/tuba_note9.ogg b/sound/weapons/tuba_note9.ogg
deleted file mode 100644 (file)
index dc19ff4..0000000
Binary files a/sound/weapons/tuba_note9.ogg and /dev/null differ