r4037 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Aug 6 08:34:27 EDT 2008
Author: div0
Date: 2008-08-06 08:34:27 -0400 (Wed, 06 Aug 2008)
New Revision: 4037
Modified:
trunk/data/qcsrc/server/cl_weaponsystem.qc
trunk/data/qcsrc/server/constants.qh
trunk/data/qcsrc/server/ctf.qc
trunk/data/qcsrc/server/domination.qc
trunk/data/qcsrc/server/g_lights.qc
trunk/data/qcsrc/server/g_triggers.qc
trunk/data/qcsrc/server/keyhunt.qc
trunk/data/qcsrc/server/t_items.qc
trunk/data/qcsrc/server/t_jumppads.qc
trunk/data/qcsrc/server/t_teleporters.qc
trunk/data/qcsrc/server/w_rocketlauncher.qc
Log:
minor channel changes, player.CHAN_AUTO is now for items too
Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc 2008-08-06 12:34:27 UTC (rev 4037)
@@ -123,7 +123,7 @@
if (self.items & IT_STRENGTH)
if (!g_minstagib)
- sound (self, CHAN_POWERUP, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM);
+ sound (self, CHAN_AUTO, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM);
};
void LaserTarget_Think()
Modified: trunk/data/qcsrc/server/constants.qh
===================================================================
--- trunk/data/qcsrc/server/constants.qh 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/constants.qh 2008-08-06 12:34:27 UTC (rev 4037)
@@ -106,12 +106,11 @@
float TE_LAVASPLASH = 10;
float TE_TELEPORT = 11;
-float CHAN_AUTO = 0; // Announcer/Chat
+float CHAN_AUTO = 0; // Announcer/Chat, on player: Triggers/Items
float CHAN_WEAPON = 1; // Weapon fire
float CHAN_VOICE = 2; // Voice/Radio
-float CHAN_TRIGGER = 3; // Triggers
+float CHAN_TRIGGER = 3; // Triggers/Items
float CHAN_PROJECTILE = 4; // Projectiles
-float CHAN_POWERUP = 5; // Powerups
float CHAN_PAIN = 6; // Pain
float CHAN_PLAYER = 7; // Player body
Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/ctf.qc 2008-08-06 12:34:27 UTC (rev 4037)
@@ -294,7 +294,7 @@
if (head.team == self.team)
UpdateFrags(head, cvar("g_ctf_flagscore_capture_team"));
- sound (self, CHAN_TRIGGER, self.noise2, VOL_BASE, ATTN_NONE);
+ sound (other, CHAN_AUTO, self.noise2, VOL_BASE, ATTN_NONE);
WaypointSprite_DetachCarrier(other);
if(self.speedrunning)
FakeTimeLimit(other, -1);
@@ -325,7 +325,7 @@
UpdateFrags(other, cvar("g_ctf_flagscore_pickup"));
PlayerScore_Add(other, SP_CTF_PICKUPS, 1);
LogCTF("steal", self.team, other);
- sound (self, CHAN_TRIGGER, self.noise, VOL_BASE, ATTN_NONE);
+ sound (other, CHAN_AUTO, self.noise, VOL_BASE, ATTN_NONE);
FOR_EACH_PLAYER(player)
if(player.team == self.team)
@@ -352,7 +352,7 @@
UpdateFrags(other, cvar("g_ctf_flagscore_return_rogue"));
PlayerScore_Add(other, SP_CTF_RETURNS, 1);
LogCTF("return", self.team, other);
- sound (self, CHAN_TRIGGER, self.noise1, VOL_BASE, ATTN_NONE);
+ sound (other, CHAN_AUTO, self.noise1, VOL_BASE, ATTN_NONE);
ReturnFlag(self);
}
else if (!other.flagcarried)
@@ -366,7 +366,7 @@
bprint(other.netname, "^7 picked up the ", self.netname, "\n");
UpdateFrags(other, cvar("g_ctf_flagscore_pickup"));
LogCTF("pickup", self.team, other);
- sound (self, CHAN_TRIGGER, self.noise, VOL_BASE, ATTN_NONE);
+ sound (other, CHAN_AUTO, self.noise, VOL_BASE, ATTN_NONE);
FOR_EACH_PLAYER(player)
if(player.team == self.team)
Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/domination.qc 2008-08-06 12:34:27 UTC (rev 4037)
@@ -68,7 +68,10 @@
self.enemy = world;
if (head.noise != "")
- sound(self, CHAN_TRIGGER, head.noise, VOL_BASE, ATTN_NORM);
+ if(self.enemy)
+ sound(self.enemy, CHAN_AUTO, head.noise, VOL_BASE, ATTN_NORM);
+ else
+ sound(self, CHAN_TRIGGER, head.noise, VOL_BASE, ATTN_NORM);
if (head.noise1 != "")
play2all(head.noise1);
Modified: trunk/data/qcsrc/server/g_lights.qc
===================================================================
--- trunk/data/qcsrc/server/g_lights.qc 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/g_lights.qc 2008-08-06 12:34:27 UTC (rev 4037)
@@ -66,7 +66,7 @@
else
self.light_lev = 0;
};
-void dynlight()
+void spawnfunc_dynlight()
{
local entity targ;
@@ -117,4 +117,4 @@
self.nextthink = self.ltime + 0.1;
self.think = dynlight_find_path;
}
-};
\ No newline at end of file
+};
Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/g_triggers.qc 2008-08-06 12:34:27 UTC (rev 4037)
@@ -140,7 +140,7 @@
}
if (self.noise)
- sound (self, CHAN_TRIGGER, self.noise, VOL_BASE, ATTN_NORM);
+ sound (self.enemy, CHAN_AUTO, self.noise, VOL_BASE, ATTN_NORM);
// don't trigger again until reset
self.takedamage = DAMAGE_NO;
Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/keyhunt.qc 2008-08-06 12:34:27 UTC (rev 4037)
@@ -435,7 +435,7 @@
void kh_Key_Collect(entity key, entity player) //a player picks up a dropped key
{
- sound(player, CHAN_TRIGGER, kh_sound_collect, VOL_BASE, ATTN_NORM);
+ sound(player, CHAN_AUTO, kh_sound_collect, VOL_BASE, ATTN_NORM);
if(key.kh_dropperteam != player.team)
{
@@ -477,7 +477,7 @@
if(suicide)
key.kh_dropperteam = player.team;
}
- sound(player, CHAN_TRIGGER, kh_sound_drop, VOL_BASE, ATTN_NORM);
+ sound(player, CHAN_AUTO, kh_sound_drop, VOL_BASE, ATTN_NORM);
}
}
@@ -542,7 +542,7 @@
self.pusher = world;
kh_Scores_Event(self.owner, self, "dropkey", 0, 0);
bprint(self.owner.netname, "^7 dropped the ", self.netname, "\n");
- sound(self.owner, CHAN_TRIGGER, kh_sound_drop, VOL_BASE, ATTN_NORM);
+ sound(self.owner, CHAN_AUTO, kh_sound_drop, VOL_BASE, ATTN_NORM);
makevectors(self.owner.v_angle);
self.velocity = W_CalculateProjectileVelocity(self.owner.velocity, cvar("g_balance_keyhunt_throwvelocity") * v_forward);
kh_Key_AssignTo(self, world);
@@ -561,7 +561,7 @@
{
if(self.siren_time < time)
{
- sound(self.owner, CHAN_TRIGGER, kh_sound_alarm, VOL_BASE, ATTN_NORM); // play a simple alarm
+ sound(self.owner, CHAN_AUTO, kh_sound_alarm, VOL_BASE, ATTN_NORM); // play a simple alarm
self.siren_time = time + 2.5; // repeat every 2.5 seconds
}
Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/t_items.qc 2008-08-06 12:34:27 UTC (rev 4037)
@@ -185,7 +185,7 @@
if (!pickedup)
return;
- sound (self, CHAN_TRIGGER, self.item_pickupsound, VOL_BASE, ATTN_NORM);
+ sound (other, CHAN_AUTO, self.item_pickupsound, VOL_BASE, ATTN_NORM);
oldself = self;
self = other;
Modified: trunk/data/qcsrc/server/t_jumppads.qc
===================================================================
--- trunk/data/qcsrc/server/t_jumppads.qc 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/t_jumppads.qc 2008-08-06 12:34:27 UTC (rev 4037)
@@ -131,7 +131,7 @@
{
// flash when activated
pointparticles(particleeffectnum("jumppad_activate"), other.origin, other.velocity, 1);
- sound (other, CHAN_TRIGGER, self.noise, VOL_BASE, ATTN_NORM);
+ sound (self, CHAN_TRIGGER, self.noise, VOL_BASE, ATTN_NORM);
self.pushltime = time + 0.2;
}
if(clienttype(other) == CLIENTTYPE_REAL)
Modified: trunk/data/qcsrc/server/t_teleporters.qc
===================================================================
--- trunk/data/qcsrc/server/t_teleporters.qc 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/t_teleporters.qc 2008-08-06 12:34:27 UTC (rev 4037)
@@ -63,7 +63,7 @@
return;
// Make teleport effect where the player left
- sound (other, CHAN_TRIGGER, "misc/teleport.wav", VOL_BASE, ATTN_NORM);
+ sound (self, CHAN_TRIGGER, "misc/teleport.wav", VOL_BASE, ATTN_NORM);
pointparticles(particleeffectnum("teleport"), other.origin, '0 0 0', 1);
// Make teleport effect where the player arrived
Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc 2008-08-06 07:10:47 UTC (rev 4036)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc 2008-08-06 12:34:27 UTC (rev 4037)
@@ -392,7 +392,7 @@
if(time > self.rl_sound)
{
self.rl_sound = time + 1;
- sound (self, CHAN_PROJECTILE, "weapons/rocket_det.wav", 0.5 * VOL_BASE, ATTN_NORM);
+ sound (self, CHAN_WEAPON, "weapons/rocket_det.wav", 0.5 * VOL_BASE, ATTN_NORM);
}
if (self.BUTTON_ATCK2)
if(g_laserguided_missile)
More information about the nexuiz-commits
mailing list