From 6241b937b08d85510a2539b894bfa38ff1a925ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Matthias=20Kr=C3=BCger?= Date: Mon, 3 Aug 2015 12:04:25 +0200 Subject: [PATCH] cl_zoomfactor: max zoom: 16->30 --- defaultXonotic.cfg | 2 +- qcsrc/client/view.qc | 4 ++-- qcsrc/menu/xonotic/dialog_settings_game_view.qc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg index 1d1d8a5af..ced5e6d97 100644 --- a/defaultXonotic.cfg +++ b/defaultXonotic.cfg @@ -72,7 +72,7 @@ seta cl_velocityzoom_time 0.2 "time value for averaging speed values" seta cl_spawnzoom 1 "zoom effect immediately when a player spawns" seta cl_spawnzoom_speed 1 "speed at which zooming occurs while spawning" seta cl_spawnzoom_factor 2 "factor of zoom while spawning" -seta cl_zoomfactor 5 "how much +zoom will zoom (1-16)" +seta cl_zoomfactor 5 "how much +zoom will zoom (1-30)" seta cl_zoomspeed 8 "how fast it will zoom (0.5-16), negative values mean instant zoom" seta cl_zoomsensitivity 0 "how zoom changes sensitivity (0 = weakest, 1 = strongest)" diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 35793364f..ade9b35bf 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -124,7 +124,7 @@ vector GetCurrentFov(float fov) zoomsensitivity = autocvar_cl_zoomsensitivity; zoomfactor = autocvar_cl_zoomfactor; - if(zoomfactor < 1 || zoomfactor > 16) + if(zoomfactor < 1 || zoomfactor > 30) zoomfactor = 2.5; zoomspeed = autocvar_cl_zoomspeed; if(zoomspeed >= 0) @@ -155,7 +155,7 @@ vector GetCurrentFov(float fov) } else if(autocvar_cl_spawnzoom && zoomin_effect) { - float spawnzoomfactor = bound(1, autocvar_cl_spawnzoom_factor, 16); + float spawnzoomfactor = bound(1, autocvar_cl_spawnzoom_factor, 30); current_viewzoom += (autocvar_cl_spawnzoom_speed * (spawnzoomfactor - current_viewzoom) * drawframetime); current_viewzoom = bound(1 / spawnzoomfactor, current_viewzoom, 1); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qc b/qcsrc/menu/xonotic/dialog_settings_game_view.qc index 40a526d56..8fc56f94c 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_view.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc @@ -79,7 +79,7 @@ void XonoticGameViewSettingsTab_fill(entity me) me.TR(me); //me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, ZCTX(_("ZOOM^Zoom factor:")))); - me.TD(me, 1, 2, e = makeXonoticSlider(2, 16, 0.5, "cl_zoomfactor")); + me.TD(me, 1, 2, e = makeXonoticSlider(2, 30, 0.5, "cl_zoomfactor")); me.TR(me); //me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, ZCTX(_("ZOOM^Zoom speed:")))); -- 2.39.2