[nexuiz-commits] r7031 - in trunk/data: . qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-06-13 15:12:38 -0400 (Sat, 13 Jun 2009)
New Revision: 7031

Modified:
   trunk/data/qcsrc/server/w_tuba.qc
   trunk/data/weapons.cfg
   trunk/data/weaponsHavoc.cfg
Log:
louder tuba please


Modified: trunk/data/qcsrc/server/w_tuba.qc
===================================================================
--- trunk/data/qcsrc/server/w_tuba.qc	2009-06-13 18:43:55 UTC (rev 7030)
+++ trunk/data/qcsrc/server/w_tuba.qc	2009-06-13 19:12:38 UTC (rev 7031)
@@ -73,10 +73,7 @@
 	vector o;
 	W_SetupShot(self, FALSE, 2, "", cvar("g_balance_tuba_damage"));
 	self.tuba_notecount = !self.tuba_notecount;
-	if(self.tuba_notecount)
-		sound(self, CHAN_WEAPON, TUBA_NOTE(Tuba_GetNote(self, hittype)), VOL_BASE, cvar("g_balance_tuba_attenuation"));
-	else
-		sound(self, CHAN_WEAPON2, TUBA_NOTE(Tuba_GetNote(self, hittype)), VOL_BASE, cvar("g_balance_tuba_attenuation"));
+	sound(self, ((self.tuba_notecount) ? CHAN_WEAPON : CHAN_WEAPON2), TUBA_NOTE(Tuba_GetNote(self, hittype)), bound(0, VOL_BASE * cvar("g_balance_tuba_volume"), 1), cvar("g_balance_tuba_attenuation"));
 	RadiusDamage(self, self, cvar("g_balance_tuba_damage"), cvar("g_balance_tuba_edgedamage"), cvar("g_balance_tuba_radius"), world, cvar("g_balance_tuba_force"), hittype | WEP_TUBA, world);
 
 	o = gettaginfo(self.exteriorweaponentity, 0);

Modified: trunk/data/weapons.cfg
===================================================================
--- trunk/data/weapons.cfg	2009-06-13 18:43:55 UTC (rev 7030)
+++ trunk/data/weapons.cfg	2009-06-13 19:12:38 UTC (rev 7031)
@@ -423,6 +423,7 @@
 set g_balance_tuba_refire 0.25
 set g_balance_tuba_animtime 0.25
 set g_balance_tuba_attenuation 0.5
+set g_balance_tuba_volume 2
 set g_balance_tuba_damage 25
 set g_balance_tuba_edgedamage 0
 set g_balance_tuba_radius 200

Modified: trunk/data/weaponsHavoc.cfg
===================================================================
--- trunk/data/weaponsHavoc.cfg	2009-06-13 18:43:55 UTC (rev 7030)
+++ trunk/data/weaponsHavoc.cfg	2009-06-13 19:12:38 UTC (rev 7031)
@@ -418,6 +418,7 @@
 set g_balance_tuba_refire 0.25
 set g_balance_tuba_animtime 0.25
 set g_balance_tuba_attenuation 0.5
+set g_balance_tuba_volume 2
 set g_balance_tuba_damage 10
 set g_balance_tuba_edgedamage 0
 set g_balance_tuba_radius 200