From f351338c233748f133c14f83ef40e23285e3b187 Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 3 Oct 2008 10:02:06 +0000 Subject: [PATCH] updated channel assignment to help tZork's turrets git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4595 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/menu/nexuiz/dialog_settings_misc.c | 3 ++- data/qcsrc/server/constants.qh | 27 ++++++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_misc.c b/data/qcsrc/menu/nexuiz/dialog_settings_misc.c index 6236b272e..8bebca5c3 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_misc.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_misc.c @@ -41,6 +41,7 @@ void fillNexuizMiscSettingsTab(entity me) me.TDempty(me, 0.2); s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_staticvolume"); me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Ambient:")); + makeMulti(s, "snd_entchannel2volume"); me.TD(me, 1, 2, s); setDependentStringNotEqual(e, "volume", "0"); setDependentStringNotEqual(s, "volume", "0"); @@ -92,7 +93,7 @@ void fillNexuizMiscSettingsTab(entity me) me.TR(me); me.TDempty(me, 0.2); s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_playerchannel1volume"); - makeMulti(s, "snd_playerchannel5volume"); + makeMulti(s, "snd_playerchannel5volume snd_entchannel1volume snd_entchannel5volume"); me.TD(me, 1, 0.8, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Weapons:")); me.TD(me, 1, 2, s); setDependentStringNotEqual(e, "volume", "0"); diff --git a/data/qcsrc/server/constants.qh b/data/qcsrc/server/constants.qh index 85dd3356f..eb0c8add1 100644 --- a/data/qcsrc/server/constants.qh +++ b/data/qcsrc/server/constants.qh @@ -106,14 +106,39 @@ float TE_LIGHTNING3 = 9; float TE_LAVASPLASH = 10; float TE_TELEPORT = 11; -float CHAN_AUTO = 0; // Announcer/Chat, on player: Triggers/Items +// this assignment must match menu/nexuiz/dialog_settings_misc.c! +float CHAN_AUTO = 0; + // on world: info (announcers, ...) + // on players: item pickup + // on entities: UNUSED float CHAN_WEAPON = 1; // Weapon fire + // on world: UNUSED + // on players: weapon firing + // on entities: turret firing float CHAN_VOICE = 2; // Voice/Radio + // on world: UNUSED + // on players: voice + // on entities: ambient float CHAN_TRIGGER = 3; // Triggers/Items + // on world: UNUSED + // on players: item pickup + // on entities: platforms moving etc. float CHAN_PROJECTILE = 4; // Projectiles + // on world: UNUSED + // on players: projectiles hitting player + // on entities: projectiles float CHAN_WEAPON2 = 5; // Nex fire (separated as it is a very long sound) + // on world: UNUSED + // on players: weapon firing + // on entities: turret firing float CHAN_PAIN = 6; // Pain + // on world: UNUSED + // on players: pain + // on entities: UNUSED float CHAN_PLAYER = 7; // Player body + // on world: UNUSED + // on players: player sounds + // on entities: player sounds float ATTN_NONE = 0; float ATTN_NORM = 0.5; -- 2.39.2