From: Rudolf Polzer Date: Sun, 3 Jul 2011 16:10:12 +0000 (+0200) Subject: fix a bunch of compile errors X-Git-Tag: xonotic-v0.5.0~151^2~2^2~15 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d33661e1062f7073896cadda679d2007426fc685;p=xonotic%2Fxonotic-data.pk3dir.git fix a bunch of compile errors --- diff --git a/qcsrc/common/constants.qh b/qcsrc/common/constants.qh index 46de6da20..c65b9e422 100644 --- a/qcsrc/common/constants.qh +++ b/qcsrc/common/constants.qh @@ -457,6 +457,7 @@ float CH_PLAYER = 263; float CH_TRIGGER2_SINGLE = 16; #endif +#ifdef LEGACY_CHANS // this assignment must match menu/xonotic/dialog_settings_misc.c! float CHAN_AUTO = 0; // on world: announcers, ... INFO @@ -498,6 +499,7 @@ float CHAN_PLAYER = 7; // Player body // on players: player sounds PLAYER // on entities: player sounds PLAYER // on csqc: UNUSED +#endif float ATTN_NONE = 0; float ATTN_MIN = 0.015625; diff --git a/qcsrc/server/cl_weaponsystem.qc b/qcsrc/server/cl_weaponsystem.qc index 8cf41bd26..3d7a33278 100644 --- a/qcsrc/server/cl_weaponsystem.qc +++ b/qcsrc/server/cl_weaponsystem.qc @@ -255,7 +255,7 @@ void W_SetupShot_Dir_ProjectileSize_Range(entity ent, vector s_forward, vector m (time > ent.prevstrengthsoundattempt + autocvar_sv_strengthsound_antispam_refire_threshold) ) // prevent insane sound spam { - sound(ent, CH_ITEMS, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM); + sound(ent, CH_TRIGGER, "weapons/strength_fire.wav", VOL_BASE, ATTN_NORM); ent.prevstrengthsound = time; } ent.prevstrengthsoundattempt = time; diff --git a/qcsrc/server/ctf.qc b/qcsrc/server/ctf.qc index 21b062958..d88ae5d37 100644 --- a/qcsrc/server/ctf.qc +++ b/qcsrc/server/ctf.qc @@ -493,7 +493,7 @@ void FlagTouch() } } - sound (other, CH_ITEMS, self.noise2, VOL_BASE, ATTN_NONE); + sound (other, CH_TRIGGER, self.noise2, VOL_BASE, ATTN_NONE); WaypointSprite_DetachCarrier(other); if(self.speedrunning) FakeTimeLimit(other, -1); @@ -531,7 +531,7 @@ void FlagTouch() self.dropperid = other.playerid; PlayerScore_Add(other, SP_CTF_PICKUPS, 1); LogCTF("steal", self.team, other); - sound (other, CH_ITEMS, self.noise, VOL_BASE, ATTN_NONE); + sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NONE); FOR_EACH_PLAYER(player) if(player.team == self.team) @@ -586,7 +586,7 @@ void FlagTouch() } PlayerScore_Add(other, SP_CTF_RETURNS, 1); LogCTF("return", self.team, other); - sound (other, CH_ITEMS, self.noise1, VOL_BASE, ATTN_NONE); + sound (other, CH_TRIGGER, self.noise1, VOL_BASE, ATTN_NONE); ReturnFlag(self); } else if (!other.flagcarried && (other.playerid != self.dropperid || time > self.ctf_droptime + autocvar_g_balance_ctf_delay_collect)) @@ -618,7 +618,7 @@ void FlagTouch() UpdateFrags(other, f); PlayerScore_Add(other, SP_CTF_PICKUPS, 1); LogCTF("pickup", self.team, other); - sound (other, CH_ITEMS, self.noise, VOL_BASE, ATTN_NONE); + sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NONE); FOR_EACH_PLAYER(player) if(player.team == self.team) diff --git a/qcsrc/server/domination.qc b/qcsrc/server/domination.qc index f0123adb0..a6cc9a88d 100644 --- a/qcsrc/server/domination.qc +++ b/qcsrc/server/domination.qc @@ -109,7 +109,7 @@ void dompoint_captured () if (head.noise != "") if(self.enemy) - sound(self.enemy, CH_ITEMS, head.noise, VOL_BASE, ATTN_NORM); + sound(self.enemy, CH_TRIGGER, head.noise, VOL_BASE, ATTN_NORM); else sound(self, CH_TRIGGER_SINGLE, head.noise, VOL_BASE, ATTN_NORM); if (head.noise1 != "") diff --git a/qcsrc/server/g_triggers.qc b/qcsrc/server/g_triggers.qc index bf7edbb0f..2b96b967a 100644 --- a/qcsrc/server/g_triggers.qc +++ b/qcsrc/server/g_triggers.qc @@ -171,7 +171,7 @@ void multi_trigger() } if (self.noise) - sound (self.enemy, CH_ITEMS, self.noise, VOL_BASE, ATTN_NORM); + sound (self.enemy, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NORM); // don't trigger again until reset self.takedamage = DAMAGE_NO; @@ -554,7 +554,7 @@ void trigger_heal_touch() { other.health = min(other.health + self.health, self.max_health); other.pauserothealth_finished = max(other.pauserothealth_finished, time + autocvar_g_balance_pause_health_rot); - sound (other, CH_ITEMS, self.noise, VOL_BASE, ATTN_NORM); + sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NORM); } } } @@ -665,7 +665,7 @@ void trigger_gravity_touch() { other.gravity = g; if(self.noise != "") - sound (other, CH_ITEMS, self.noise, VOL_BASE, ATTN_NORM); + sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NORM); UpdateCSQCProjectile(self.owner); } }; diff --git a/qcsrc/server/mutators/gamemode_keepaway.qc b/qcsrc/server/mutators/gamemode_keepaway.qc index 2e1d80d78..ac6d5dccd 100644 --- a/qcsrc/server/mutators/gamemode_keepaway.qc +++ b/qcsrc/server/mutators/gamemode_keepaway.qc @@ -128,7 +128,7 @@ void ka_TouchEvent() // runs any time that the ball comes in contact with someth Send_KillNotification(other.netname, "", "", KA_PICKUPBALL, MSG_KA); WriteByte(MSG_BROADCAST, SVC_CENTERPRINT); WriteString(MSG_BROADCAST, strcat("\n\n", other.netname, "^7 has picked up the ball!\n")); - sound(self.owner, CH_ITEMS, "keepaway/pickedup.wav", VOL_BASE, ATTN_NONE); // ATTN_NONE (it's a sound intended to be heard anywhere) + sound(self.owner, CH_TRIGGER, "keepaway/pickedup.wav", VOL_BASE, ATTN_NONE); // ATTN_NONE (it's a sound intended to be heard anywhere) // scoring PlayerScore_Add(other, SP_KEEPAWAY_PICKUPS, 1); @@ -170,7 +170,7 @@ void ka_DropEvent(entity plyr) // runs any time that a player is supposed to los Send_KillNotification(plyr.netname, "", "", KA_DROPBALL, MSG_KA); WriteByte(MSG_BROADCAST, SVC_CENTERPRINT); WriteString(MSG_BROADCAST, strcat("\n\n", plyr.netname, "^7 has dropped the ball!\n")); - sound(plyr, CH_ITEMS, "keepaway/dropped.wav", VOL_BASE, ATTN_NONE); // ATTN_NONE (it's a sound intended to be heard anywhere) + sound(plyr, CH_TRIGGER, "keepaway/dropped.wav", VOL_BASE, ATTN_NONE); // ATTN_NONE (it's a sound intended to be heard anywhere) // scoring // PlayerScore_Add(plyr, SP_KEEPAWAY_DROPS, 1); Not anymore, this is 100% the same as pickups and is useless. diff --git a/qcsrc/server/mutators/gamemode_keyhunt.qc b/qcsrc/server/mutators/gamemode_keyhunt.qc index 515541fc3..decada031 100644 --- a/qcsrc/server/mutators/gamemode_keyhunt.qc +++ b/qcsrc/server/mutators/gamemode_keyhunt.qc @@ -413,7 +413,7 @@ void kh_Key_Damage(entity inflictor, entity attacker, float damage, float deatht void kh_Key_Collect(entity key, entity player) //a player picks up a dropped key { - sound(player, CH_ITEMS, kh_sound_collect, VOL_BASE, ATTN_NORM); + sound(player, CH_TRIGGER, kh_sound_collect, VOL_BASE, ATTN_NORM); if(key.kh_dropperteam != player.team) { @@ -664,7 +664,7 @@ void kh_Key_Think() // runs all the time { if(self.siren_time < time) { - sound(self.owner, CH_ITEMS, kh_sound_alarm, VOL_BASE, ATTN_NORM); // play a simple alarm + sound(self.owner, CH_TRIGGER, kh_sound_alarm, VOL_BASE, ATTN_NORM); // play a simple alarm self.siren_time = time + 2.5; // repeat every 2.5 seconds } @@ -799,7 +799,7 @@ void kh_Key_DropOne(entity key) key.pushltime = time + autocvar_g_balance_keyhunt_protecttime; key.kh_dropperteam = key.team; - sound(player, CH_ITEMS, kh_sound_drop, VOL_BASE, ATTN_NORM); + sound(player, CH_TRIGGER, kh_sound_drop, VOL_BASE, ATTN_NORM); } void kh_Key_DropAll(entity player, float suicide) // runs whenever a player dies @@ -825,7 +825,7 @@ void kh_Key_DropAll(entity player, float suicide) // runs whenever a player dies if(suicide) key.kh_dropperteam = player.team; } - sound(player, CH_ITEMS, kh_sound_drop, VOL_BASE, ATTN_NORM); + sound(player, CH_TRIGGER, kh_sound_drop, VOL_BASE, ATTN_NORM); } } diff --git a/qcsrc/server/nexball.qc b/qcsrc/server/nexball.qc index e2f4d5a8a..3ee7b5597 100644 --- a/qcsrc/server/nexball.qc +++ b/qcsrc/server/nexball.qc @@ -604,7 +604,7 @@ void W_Nexball_Touch (void) if(!attacker.ballcarried) { LogNB("stole", attacker); - sound (other, CH_ITEMS, ball.noise2, VOL_BASE, ATTN_NORM); + sound (other, CH_TRIGGER, ball.noise2, VOL_BASE, ATTN_NORM); if(attacker.team == other.team && time > attacker.teamkill_complain) { diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc index b101c0202..001063585 100644 --- a/qcsrc/server/t_items.qc +++ b/qcsrc/server/t_items.qc @@ -447,7 +447,7 @@ float Item_GiveTo(entity item, entity player) if (!pickedup) return 0; - sound (player, CH_ITEMS, item.item_pickupsound, VOL_BASE, ATTN_NORM); + sound (player, CH_TRIGGER, item.item_pickupsound, VOL_BASE, ATTN_NORM); if (_switchweapon) if (player.switchweapon != w_getbestweapon(player)) W_SwitchWeapon_Force(player, w_getbestweapon(player)); @@ -1532,12 +1532,12 @@ void GiveSound(entity e, float v0, float v1, float t, string snd_incr, string sn if(v1 <= v0 - t) { if(snd_decr != "") - sound (e, CH_ITEMS, snd_decr, VOL_BASE, ATTN_NORM); + sound (e, CH_TRIGGER, snd_decr, VOL_BASE, ATTN_NORM); } else if(v0 >= v0 + t) { if(snd_incr != "") - sound (e, CH_ITEMS, snd_incr, VOL_BASE, ATTN_NORM); + sound (e, CH_TRIGGER, snd_incr, VOL_BASE, ATTN_NORM); } } diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc index d12379d64..18dbef171 100644 --- a/qcsrc/server/t_jumppads.qc +++ b/qcsrc/server/t_jumppads.qc @@ -155,7 +155,7 @@ void trigger_push_touch() { // flash when activated pointparticles(particleeffectnum("jumppad_activate"), other.origin, other.velocity, 1); - sound (other, CH_ITEMS, self.noise, VOL_BASE, ATTN_NORM); + sound (other, CH_TRIGGER, self.noise, VOL_BASE, ATTN_NORM); self.pushltime = time + 0.2; } local float ct;