X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=view.c;h=b19f110a5ecee637ed86323545da62e3c0d8f7a1;hb=f5680929fc0f74c0b26073a8dc238ed7b6815317;hp=de4c36311676e54292aaae58d5aa099ff6817482;hpb=cb124a812a90a43f6984e999244548896c0110b3;p=xonotic%2Fdarkplaces.git

diff --git a/view.c b/view.c
index de4c3631..b19f110a 100644
--- a/view.c
+++ b/view.c
@@ -46,18 +46,18 @@ cvar_t cl_bobmodel_up = {CVAR_SAVE, "cl_bobmodel_up", "0.06", "gun bobbing upwar
 cvar_t cl_bobmodel_speed = {CVAR_SAVE, "cl_bobmodel_speed", "7", "gun bobbing speed"};
 
 cvar_t cl_leanmodel_side = {CVAR_SAVE, "cl_leanmodel_side", "1", "enables gun leaning sideways"};
-cvar_t cl_leanmodel_side_speed = {CVAR_SAVE, "cl_leanmodel_side_speed", "2.5", "gun leaning sideways speed"};
-cvar_t cl_leanmodel_side_limit = {CVAR_SAVE, "cl_leanmodel_side_limit", "7.5", "gun leaning sideways limit"};
+cvar_t cl_leanmodel_side_speed = {CVAR_SAVE, "cl_leanmodel_side_speed", "15", "gun leaning sideways speed"};
+cvar_t cl_leanmodel_side_limit = {CVAR_SAVE, "cl_leanmodel_side_limit", "5", "gun leaning sideways limit"};
 cvar_t cl_leanmodel_up = {CVAR_SAVE, "cl_leanmodel_up", "1", "enables gun leaning upward"};
-cvar_t cl_leanmodel_up_speed = {CVAR_SAVE, "cl_leanmodel_up_speed", "2", "gun leaning upward speed"};
-cvar_t cl_leanmodel_up_limit = {CVAR_SAVE, "cl_leanmodel_up_limit", "5", "gun leaning upward limit"};
+cvar_t cl_leanmodel_up_speed = {CVAR_SAVE, "cl_leanmodel_up_speed", "10", "gun leaning upward speed"};
+cvar_t cl_leanmodel_up_limit = {CVAR_SAVE, "cl_leanmodel_up_limit", "2.5", "gun leaning upward limit"};
 
 cvar_t cl_followmodel_side = {CVAR_SAVE, "cl_followmodel_side", "1", "enables gun following sideways"};
-cvar_t cl_followmodel_side_speed = {CVAR_SAVE, "cl_followmodel_side_speed", "4", "gun following sideways speed"};
-cvar_t cl_followmodel_side_limit = {CVAR_SAVE, "cl_followmodel_side_limit", "2", "gun following sideways limit"};
+cvar_t cl_followmodel_side_speed = {CVAR_SAVE, "cl_followmodel_side_speed", "15", "gun following sideways speed"};
+cvar_t cl_followmodel_side_limit = {CVAR_SAVE, "cl_followmodel_side_limit", "1", "gun following sideways limit"};
 cvar_t cl_followmodel_up = {CVAR_SAVE, "cl_followmodel_up", "1", "enables gun following upward"};
-cvar_t cl_followmodel_up_speed = {CVAR_SAVE, "cl_followmodel_up_speed", "3", "gun following upward speed"};
-cvar_t cl_followmodel_up_limit = {CVAR_SAVE, "cl_followmodel_up_limit", "1", "gun following upward limit"};
+cvar_t cl_followmodel_up_speed = {CVAR_SAVE, "cl_followmodel_up_speed", "10", "gun following upward speed"};
+cvar_t cl_followmodel_up_limit = {CVAR_SAVE, "cl_followmodel_up_limit", "0.5", "gun following upward limit"};
 
 cvar_t cl_viewmodel_scale = {0, "cl_viewmodel_scale", "1", "changes size of gun model, lower values prevent poking into walls but cause strange artifacts on lighting and especially r_stereo/vid_stereobuffer options where the size of the gun becomes visible"};
 
@@ -533,7 +533,7 @@ void V_CalcRefdef (void)
 				{
 					double xyspeed, bob;
 					vec_t d;
-					vec_t ef_speed = cl.realframetime;
+					vec_t ef_speed = cl.realframetime * cl.movevars_timescale;
 
 					// gun model leaning code
 					if(cl_leanmodel_up.value && cl_leanmodel_up_speed.value * ef_speed < 1) // bad things happen if this goes over 1, so prevent the effect
@@ -600,7 +600,7 @@ void V_CalcRefdef (void)
 
 					VectorCopy(cl.gunorg_follow, gunorg);
 
-					// gun model bobbing code
+					// view bobbing code
 					xyspeed = sqrt(cl.movement_velocity[0]*cl.movement_velocity[0] + cl.movement_velocity[1]*cl.movement_velocity[1]);
 					if (cl_bob.value && cl_bobcycle.value)
 					{
@@ -620,8 +620,14 @@ void V_CalcRefdef (void)
 						bob = xyspeed * cl_bob.value;
 						bob = bob*0.3 + bob*0.7*cycle;
 						vieworg[2] += bound(-7, bob, 4);
+						// we also need to adjust gunorg, or this appears like pushing the gun!
+						// In the old code, this was applied to vieworg BEFORE copying to gunorg,
+						// but this is not viable with the new followmodel code as that would mean
+						// that followmodel would work on the munged-by-bob vieworg and do feedback
+						gunorg[2] += bound(-7, bob, 4);
 					}
 
+					// gun model bobbing code
 					if (cl_bob.value && cl_bobmodel.value)
 					{
 						// calculate for swinging gun model