From f9eac3e9effbe6561ed877f8960955b43d527944 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Fri, 10 Jun 2011 23:14:10 +0200 Subject: [PATCH] make shootfromeye and shootfromclient show properly by default --- defaultXonotic.cfg | 4 ++-- qcsrc/server/miscfunctions.qc | 14 ++++---------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index c7432db18..149f28bd9 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -909,7 +909,7 @@ r_shadow_realtime_world_lightmaps 1 seta r_ambient 4 cl_decals_fadetime 5 cl_decals_time 2 -seta cl_gunalign 1 "Gun alignment; 1 = right, 2 = left, 3 = center (if allowed by g_shootfromclient) or right, 4 = center (if allowed by g_shootfromclient) or left" +seta cl_gunalign 1 "Gun alignment; 1 = right only, 2 = left only, 3 = center (if allowed by g_shootfromclient) or right, 4 = center (if allowed by g_shootfromclient) or left" seta cl_nogibs 0 "reduce number of violence effects, or remove them totally" seta cl_particlegibs 0 "simpler gibs" seta cl_gibs_damageforcescale 3.5 "force to push around gibs" @@ -1901,7 +1901,7 @@ seta cl_vehicle_spiderbot_cross_alpha 0.6 seta cl_vehicle_spiderbot_cross_size 1 //cl_gunalign calculator -seta menu_cl_gunalign 1 "Gun alignment; 1 = right, 2 = left, 3 = center (if allowed by g_shootfromclient) or right, 4 = center (if allowed by g_shootfromclient) or left" +seta menu_cl_gunalign 1 "Gun alignment; 1 = right only, 2 = left only, 3 = center (if allowed by g_shootfromclient) or right, 4 = center (if allowed by g_shootfromclient) or left" alias _gunalign_01 "cl_gunalign 1" alias _gunalign_02 "cl_gunalign 2" alias _gunalign_03 "cl_gunalign 3" diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc index 6622dea1f..474f713ff 100644 --- a/qcsrc/server/miscfunctions.qc +++ b/qcsrc/server/miscfunctions.qc @@ -2670,7 +2670,8 @@ vector shotorg_adjust_values(vector vecs, float y_is_right, float visual, float { if (visual) { - vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE, algn); + vecs_y = 0; + vecs_z -= 2; } else { @@ -2680,15 +2681,8 @@ vector shotorg_adjust_values(vector vecs, float y_is_right, float visual, float } else if (autocvar_g_shootfromcenter) { - if (visual) - { - vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE, algn); - } - else - { - vecs_y = 0; - vecs_z -= 2; - } + vecs_y = 0; + vecs_z -= 2; } else if ((s = autocvar_g_shootfromfixedorigin) != "") { -- 2.39.2