From: Mario Date: Mon, 17 Jul 2017 14:49:29 +0000 (+1000) Subject: Split g_jetpack_attenuation out of the balance configs and rename it to cl_jetpack_at... X-Git-Tag: xonotic-v0.8.5~2580 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6792b5c14ddf90b92ae8f5d15318322a5d4733b7;p=xonotic%2Fxonotic-data.pk3dir.git Split g_jetpack_attenuation out of the balance configs and rename it to cl_jetpack_attenuation (it's a purely client side option) --- diff --git a/balance-mario.cfg b/balance-mario.cfg index d290be012..42cf31196 100644 --- a/balance-mario.cfg +++ b/balance-mario.cfg @@ -207,7 +207,6 @@ set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (n set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction" set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction" set g_jetpack_fuel 8 "fuel per second for jetpack" -set g_jetpack_attenuation 2 "jetpack sound attenuation" set g_jetpack_reverse_thrust 0 "if not 0, downward acceleration when crouching with the jetpack" set g_grappling_hook_tarzan 2 // 2: can also pull players diff --git a/balance-nexuiz25.cfg b/balance-nexuiz25.cfg index 39405f399..4967fa7e4 100644 --- a/balance-nexuiz25.cfg +++ b/balance-nexuiz25.cfg @@ -207,7 +207,6 @@ set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (n set g_jetpack_maxspeed_side 1500 "max speed of the jetpack in xy direction" set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction" set g_jetpack_fuel 8 "fuel per second for jetpack" -set g_jetpack_attenuation 2 "jetpack sound attenuation" set g_jetpack_reverse_thrust 0 "if not 0, downward acceleration when crouching with the jetpack" set g_grappling_hook_tarzan 2 // 2: can also pull players diff --git a/balance-overkill.cfg b/balance-overkill.cfg index 381eb51d7..fc99616f9 100644 --- a/balance-overkill.cfg +++ b/balance-overkill.cfg @@ -207,7 +207,6 @@ set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (n set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction" set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction" set g_jetpack_fuel 8 "fuel per second for jetpack" -set g_jetpack_attenuation 2 "jetpack sound attenuation" set g_jetpack_reverse_thrust 0 "if not 0, downward acceleration when crouching with the jetpack" set g_grappling_hook_tarzan 2 // 2: can also pull players diff --git a/balance-samual.cfg b/balance-samual.cfg index ad7192227..4357eff76 100644 --- a/balance-samual.cfg +++ b/balance-samual.cfg @@ -207,7 +207,6 @@ set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (n set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction" set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction" set g_jetpack_fuel 8 "fuel per second for jetpack" -set g_jetpack_attenuation 2 "jetpack sound attenuation" set g_jetpack_reverse_thrust 0 "if not 0, downward acceleration when crouching with the jetpack" set g_grappling_hook_tarzan 2 // 2: can also pull players diff --git a/balance-xdf.cfg b/balance-xdf.cfg index 5eda67ba9..a7d6b4374 100644 --- a/balance-xdf.cfg +++ b/balance-xdf.cfg @@ -207,7 +207,6 @@ set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (n set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction" set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction" set g_jetpack_fuel 8 "fuel per second for jetpack" -set g_jetpack_attenuation 2 "jetpack sound attenuation" set g_jetpack_reverse_thrust 0 "if not 0, downward acceleration when crouching with the jetpack" set g_grappling_hook_tarzan 2 // 2: can also pull players diff --git a/balance-xonotic.cfg b/balance-xonotic.cfg index f317d2e6b..5bd1536fe 100644 --- a/balance-xonotic.cfg +++ b/balance-xonotic.cfg @@ -207,7 +207,6 @@ set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (n set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction" set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction" set g_jetpack_fuel 8 "fuel per second for jetpack" -set g_jetpack_attenuation 2 "jetpack sound attenuation" set g_jetpack_reverse_thrust 0 "if not 0, downward acceleration when crouching with the jetpack" set g_grappling_hook_tarzan 2 // 2: can also pull players diff --git a/balance-xpm.cfg b/balance-xpm.cfg index f5ec29240..5c14aa362 100644 --- a/balance-xpm.cfg +++ b/balance-xpm.cfg @@ -207,7 +207,6 @@ set g_jetpack_acceleration_up 600 "acceleration of the jetpack in z direction (n set g_jetpack_maxspeed_side 1200 "max speed of the jetpack in xy direction" set g_jetpack_maxspeed_up 600 "max speed of the jetpack in z direction" set g_jetpack_fuel 8 "fuel per second for jetpack" -set g_jetpack_attenuation 2 "jetpack sound attenuation" set g_jetpack_reverse_thrust 0 "if not 0, downward acceleration when crouching with the jetpack" set g_grappling_hook_tarzan 2 // 2: can also pull players diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index bd4be43c5..63ec73fc3 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -1168,6 +1168,7 @@ seta cl_gentle_messages 0 "client side gentle mode (only replaces frag messages/ seta cl_gentle_damage 0 "client side gentle mode (only replaces damage flash); when set to 1, a white flash replaces the blood image, when set to 2, a randomly colored flash is used instead" set g_jetpack 0 "Jetpack mutator" +set cl_jetpack_attenuation 2 "jetpack sound attenuation" set g_running_guns 0 "... or wonder, till it drives you mad, what would have followed if you had." diff --git a/qcsrc/client/autocvars.qh b/qcsrc/client/autocvars.qh index 2711cd182..6d3fb6267 100644 --- a/qcsrc/client/autocvars.qh +++ b/qcsrc/client/autocvars.qh @@ -440,7 +440,7 @@ int autocvar__cl_playerskin; string autocvar__cl_playermodel; float autocvar_cl_deathglow; bool autocvar_developer_csqcentities; -float autocvar_g_jetpack_attenuation; +float autocvar_cl_jetpack_attenuation = 2; bool autocvar_cl_showspectators; int autocvar_cl_nade_timer; bool autocvar_r_drawviewmodel; diff --git a/qcsrc/client/csqcmodel_hooks.qc b/qcsrc/client/csqcmodel_hooks.qc index 104465360..d2b28e9b0 100644 --- a/qcsrc/client/csqcmodel_hooks.qc +++ b/qcsrc/client/csqcmodel_hooks.qc @@ -561,7 +561,7 @@ void CSQCModel_Effects_Apply(entity this) { if(!this.snd_looping) { - sound(this, CH_TRIGGER_SINGLE, SND_JETPACK_FLY, VOL_BASE, autocvar_g_jetpack_attenuation); + sound(this, CH_TRIGGER_SINGLE, SND_JETPACK_FLY, VOL_BASE, autocvar_cl_jetpack_attenuation); this.snd_looping = CH_TRIGGER_SINGLE; } } @@ -569,7 +569,7 @@ void CSQCModel_Effects_Apply(entity this) { if(this.snd_looping) { - sound(this, this.snd_looping, SND_Null, VOL_BASE, autocvar_g_jetpack_attenuation); + sound(this, this.snd_looping, SND_Null, VOL_BASE, autocvar_cl_jetpack_attenuation); this.snd_looping = 0; } } diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc index 13b63652b..539461187 100644 --- a/qcsrc/client/main.qc +++ b/qcsrc/client/main.qc @@ -854,7 +854,7 @@ void Ent_Remove(entity this) if(this.snd_looping > 0) { - sound(this, this.snd_looping, SND_Null, VOL_BASE, autocvar_g_jetpack_attenuation); + sound(this, this.snd_looping, SND_Null, VOL_BASE, autocvar_cl_jetpack_attenuation); this.snd_looping = 0; }