From: Samual <samual@xonotic.org>
Date: Mon, 20 Feb 2012 00:31:12 +0000 (-0500)
Subject: Better bob defaults and options in menu
X-Git-Tag: xonotic-v0.6.0~66^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=29834d4c2da68e3b67ce2412a2a5776c409ca600;p=xonotic%2Fxonotic-data.pk3dir.git

Better bob defaults and options in menu
---

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index bd85db335..27ec131f7 100644
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -106,14 +106,17 @@ r_hdr_glowintensity 1
 // these settings determine how much the view is affected by movement/damage
 cl_smoothviewheight 0.05 // time of the averaging to the viewheight value so that it creates a smooth transition for crouching and such. 0 for instant transition
 cl_deathfade 0 // fade screen to dark red when dead, value represents how fast the fade is (higher is faster)
-cl_bobcycle 0 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
-cl_bob 0.01 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
-cl_bob2cycle 0 // how long the cycle of left/right view movement takes (only works if cl_bob2 is not 0), default is 0.6
-cl_bob2 0.01 // how much view moves left/right when moving (does not move if cl_bob2cycle is 0), default is 0.01
+cl_bobcycle 0.5 // how long the cycle of up/down view movement takes (only works if cl_bob is not 0), default is 0.6
+cl_bob 0 // how much view moves up/down when moving (does not move if cl_bobcycle is 0, but still enables cl_bobmodel), default is 0.02
+cl_bob2cycle 1 // how long the cycle of left/right view movement takes (only works if cl_bob2 is not 0), default is 0.6
+cl_bob2 0 // how much view moves left/right when moving (does not move if cl_bob2cycle is 0), default is 0.01
 cl_bobfall 0.05 "how much the view swings down when falling (influenced by the speed you hit the ground with)"
 cl_bobfallcycle 3 "speed of the bobfall swing"
 cl_bobfallspeed 200 "necessary amount of speed for bob-falling to occur"
 cl_bobmodel 1 // whether to have gun model move around on screen when moving (only works if cl_bob is not 0), default is 1
+cl_bobmodel_side 0.2 // amount the gun sways to the sides
+cl_bobmodel_speed 5 // rate at which the gun sways
+cl_bobmodel_up 0.1 // amount the gun sways up and down
 cl_leanmodel 1 // enables weapon leaning effect when looking around
 cl_leanmodel_side_speed 0.7 "gun leaning sideways speed"
 cl_leanmodel_side_limit 35 "gun leaning sideways limit"
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
index bfa52ec45..7e7c46b4f 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
@@ -88,8 +88,8 @@ void XonoticViewDialog_fill(entity me)
 		setDependent(e, "chase_active", -1, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(0.65, 0, "cl_bobcycle", _("View bobbing while walking around")));
-		makeMulti(e, "cl_bob2cycle");
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(0.01, 0, "cl_bob", _("View bobbing while walking around")));
+		makeMulti(e, "cl_bob2");
 		setDependent(e, "chase_active", -1, 0);
 	me.TR(me);
 	me.TR(me);