From 9b7a896437661dd51c0792086b7c6bb22dacec2f Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 6 Aug 2008 12:34:27 +0000 Subject: [PATCH] minor channel changes, player.CHAN_AUTO is now for items too git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4037 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/cl_weaponsystem.qc | 2 +- data/qcsrc/server/constants.qh | 5 ++--- data/qcsrc/server/ctf.qc | 8 ++++---- data/qcsrc/server/domination.qc | 5 ++++- data/qcsrc/server/g_lights.qc | 4 ++-- data/qcsrc/server/g_triggers.qc | 2 +- data/qcsrc/server/keyhunt.qc | 8 ++++---- data/qcsrc/server/t_items.qc | 2 +- data/qcsrc/server/t_jumppads.qc | 2 +- data/qcsrc/server/t_teleporters.qc | 2 +- data/qcsrc/server/w_rocketlauncher.qc | 2 +- 11 files changed, 22 insertions(+), 20 deletions(-) diff --git a/data/qcsrc/server/cl_weaponsystem.qc b/data/qcsrc/server/cl_weaponsystem.qc index 89067496b..494005c4e 100644 --- a/data/qcsrc/server/cl_weaponsystem.qc +++ b/data/qcsrc/server/cl_weaponsystem.qc @@ -123,7 +123,7 @@ void W_SetupShot(entity ent, vector vecs, float antilag, float recoil, string sn 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() diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh index 8e4663442..4e28e0aae 100644 --- a/data/qcsrc/server/constants.qh +++ b/data/qcsrc/server/constants.qh @@ -106,12 +106,11 @@ float TE_LIGHTNING3 = 9; 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 diff --git a/data/qcsrc/server/ctf.qc b/data/qcsrc/server/ctf.qc index f0fd73399..ea5a49b86 100644 --- a/data/qcsrc/server/ctf.qc +++ b/data/qcsrc/server/ctf.qc @@ -294,7 +294,7 @@ void FlagTouch() 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 @@ void FlagTouch() 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 @@ void FlagTouch() 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 @@ void FlagTouch() 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) diff --git a/data/qcsrc/server/domination.qc b/data/qcsrc/server/domination.qc index 32660984c..6e6819896 100644 --- a/data/qcsrc/server/domination.qc +++ b/data/qcsrc/server/domination.qc @@ -68,7 +68,10 @@ void dompoint_captured () 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); diff --git a/data/qcsrc/server/g_lights.qc b/data/qcsrc/server/g_lights.qc index 787cb1d10..9af723115 100644 --- a/data/qcsrc/server/g_lights.qc +++ b/data/qcsrc/server/g_lights.qc @@ -66,7 +66,7 @@ void dynlight_use() else self.light_lev = 0; }; -void dynlight() +void spawnfunc_dynlight() { local entity targ; @@ -117,4 +117,4 @@ void dynlight() self.nextthink = self.ltime + 0.1; self.think = dynlight_find_path; } -}; \ No newline at end of file +}; diff --git a/data/qcsrc/server/g_triggers.qc b/data/qcsrc/server/g_triggers.qc index 6616e29dd..1a89a6a6e 100644 --- a/data/qcsrc/server/g_triggers.qc +++ b/data/qcsrc/server/g_triggers.qc @@ -140,7 +140,7 @@ void multi_trigger() } 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; diff --git a/data/qcsrc/server/keyhunt.qc b/data/qcsrc/server/keyhunt.qc index c13cb7675..a4d12cd8d 100644 --- a/data/qcsrc/server/keyhunt.qc +++ b/data/qcsrc/server/keyhunt.qc @@ -435,7 +435,7 @@ float kh_Key_AllOwnedByWhichTeam() // constantly called. check to see if all th 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 @@ void kh_Key_DropAll(entity player, float suicide) // runs whenever a player dies 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 @@ void kh_Key_Think() // runs all the time 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 @@ void kh_Key_Think() // runs all the time { 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 } diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc index ac7bc5d80..3ff8ab92c 100644 --- a/data/qcsrc/server/t_items.qc +++ b/data/qcsrc/server/t_items.qc @@ -185,7 +185,7 @@ void Item_Touch (void) 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; diff --git a/data/qcsrc/server/t_jumppads.qc b/data/qcsrc/server/t_jumppads.qc index 628c60c47..a96efe6a2 100644 --- a/data/qcsrc/server/t_jumppads.qc +++ b/data/qcsrc/server/t_jumppads.qc @@ -131,7 +131,7 @@ void trigger_push_touch() { // 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) diff --git a/data/qcsrc/server/t_teleporters.qc b/data/qcsrc/server/t_teleporters.qc index 43c62189d..e3540eb02 100644 --- a/data/qcsrc/server/t_teleporters.qc +++ b/data/qcsrc/server/t_teleporters.qc @@ -63,7 +63,7 @@ void Teleport_Touch (void) 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 diff --git a/data/qcsrc/server/w_rocketlauncher.qc b/data/qcsrc/server/w_rocketlauncher.qc index 019df5fc3..799b8268a 100644 --- a/data/qcsrc/server/w_rocketlauncher.qc +++ b/data/qcsrc/server/w_rocketlauncher.qc @@ -392,7 +392,7 @@ float w_rlauncher(float req) 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) -- 2.39.2