X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cl_input.c;h=6f25cee6913ee4bab67e2da0674a9a2e4979d23e;hb=15ba263dfc057719e51ffd7ba6ecb0fe7efb400c;hp=d18414039b7aa9c994f529821857b495ad1a8248;hpb=e7b94ee742d220019c15cc5720215b75cf3fb24c;p=xonotic%2Fdarkplaces.git

diff --git a/cl_input.c b/cl_input.c
index d1841403..6f25cee6 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -622,17 +622,10 @@ void CL_Input (void)
 	}
 
 	// if not in menu, apply mouse move to viewangles/movement
-	if (!key_consoleactive && key_dest == key_game && !cl.csqc_wantsmousemove)
+	if (!key_consoleactive && key_dest == key_game && !cl.csqc_wantsmousemove && cl_prydoncursor.integer <= 0)
 	{
 		float modulatedsensitivity = sensitivity.value * cl.sensitivityscale;
-		if (cl_prydoncursor.integer > 0)
-		{
-			// mouse interacting with the scene, mostly stationary view
-			V_StopPitchDrift();
-			cl.cmd.cursor_screen[0] += in_mouse_x * modulatedsensitivity / vid.width;
-			cl.cmd.cursor_screen[1] += in_mouse_y * modulatedsensitivity / vid.height;
-		}
-		else if (in_strafe.state & 1)
+		if (in_strafe.state & 1)
 		{
 			// strafing mode, all looking is movement
 			V_StopPitchDrift();
@@ -660,7 +653,13 @@ void CL_Input (void)
 		}
 	}
 	else // don't pitch drift when csqc is controlling the mouse
+	{
+		// mouse interacting with the scene, mostly stationary view
 		V_StopPitchDrift();
+		// update prydon cursor
+		cl.cmd.cursor_screen[0] = in_windowmouse_x * 2.0 / vid.width - 1.0;
+		cl.cmd.cursor_screen[1] = in_windowmouse_y * 2.0 / vid.height - 1.0;
+	}
 
 	if(v_flipped.integer)
 	{
@@ -1142,7 +1141,9 @@ void CL_ClientMovement_Physics_CPM_PM_Aircontrol(cl_clientmovement_state_t *s, v
 	dot = DotProduct(s->velocity, wishdir);
 
 	if(dot > 0) { // we can't change direction while slowing down
-		k *= cl.movevars_aircontrol*pow(dot, cl.movevars_aircontrol_power)*s->cmd.frametime;
+		k *= pow(dot, cl.movevars_aircontrol_power)*s->cmd.frametime;
+		speed = max(0, speed - cl.movevars_aircontrol_penalty * sqrt(max(0, 1 - dot*dot)) * k/32);
+		k *= cl.movevars_aircontrol;
 		VectorMAM(speed, s->velocity, k, wishdir, s->velocity);
 		VectorNormalize(s->velocity);
 	}
@@ -1397,8 +1398,14 @@ void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
 
 			// CPM: air control
 			if(cl.movevars_airstopaccelerate != 0)
-				if(DotProduct(s->velocity, wishdir) < 0)
-					accel = cl.movevars_airstopaccelerate;
+			{
+				vec3_t curdir;
+				curdir[0] = s->velocity[0];
+				curdir[1] = s->velocity[1];
+				curdir[2] = 0;
+				VectorNormalize(curdir);
+				accel = accel + (cl.movevars_airstopaccelerate - accel) * max(0, -DotProduct(curdir, wishdir));
+			}
 			strafity = CL_IsMoveInDirection(s->cmd.forwardmove, s->cmd.sidemove, -90) + CL_IsMoveInDirection(s->cmd.forwardmove, s->cmd.sidemove, +90); // if one is nonzero, other is always zero
 			if(cl.movevars_maxairstrafespeed)
 				wishspeed = min(wishspeed, CL_GeomLerp(cl.movevars_maxairspeed, strafity, cl.movevars_maxairstrafespeed));
@@ -1478,6 +1485,7 @@ void CL_UpdateMoveVars(void)
 		cl.movevars_airstrafeaccel_qw = cl.statsf[STAT_MOVEVARS_AIRSTRAFEACCEL_QW];
 		cl.movevars_aircontrol = cl.statsf[STAT_MOVEVARS_AIRCONTROL];
 		cl.movevars_aircontrol_power = cl.statsf[STAT_MOVEVARS_AIRCONTROL_POWER];
+		cl.movevars_aircontrol_penalty = cl.statsf[STAT_MOVEVARS_AIRCONTROL_PENALTY];
 		cl.movevars_warsowbunny_airforwardaccel = cl.statsf[STAT_MOVEVARS_WARSOWBUNNY_AIRFORWARDACCEL];
 		cl.movevars_warsowbunny_accel = cl.statsf[STAT_MOVEVARS_WARSOWBUNNY_ACCEL];
 		cl.movevars_warsowbunny_topspeed = cl.statsf[STAT_MOVEVARS_WARSOWBUNNY_TOPSPEED];
@@ -1513,6 +1521,7 @@ void CL_UpdateMoveVars(void)
 		cl.movevars_airstrafeaccel_qw = 0;
 		cl.movevars_aircontrol = 0;
 		cl.movevars_aircontrol_power = 2;
+		cl.movevars_aircontrol_penalty = 0;
 		cl.movevars_warsowbunny_airforwardaccel = 0;
 		cl.movevars_warsowbunny_accel = 0;
 		cl.movevars_warsowbunny_topspeed = 0;
@@ -1528,7 +1537,7 @@ void CL_UpdateMoveVars(void)
 	}
 
 	if(cl.movevars_aircontrol_power <= 0)
-		cl.movevars_aircontrol = 2; // CPMA default
+		cl.movevars_aircontrol_power = 2; // CPMA default
 }
 
 void CL_ClientMovement_Replay(void)
@@ -1741,10 +1750,13 @@ void CL_SendMove(void)
 	if (in_button16.state  & 3) bits |= 262144;
 	// button bits 19-31 unused currently
 	// rotate/zoom view serverside if PRYDON_CLIENTCURSOR cursor is at edge of screen
-	if (cl.cmd.cursor_screen[0] <= -1) bits |= 8;
-	if (cl.cmd.cursor_screen[0] >=  1) bits |= 16;
-	if (cl.cmd.cursor_screen[1] <= -1) bits |= 32;
-	if (cl.cmd.cursor_screen[1] >=  1) bits |= 64;
+	if(cl_prydoncursor.integer > 0)
+	{
+		if (cl.cmd.cursor_screen[0] <= -1) bits |= 8;
+		if (cl.cmd.cursor_screen[0] >=  1) bits |= 16;
+		if (cl.cmd.cursor_screen[1] <= -1) bits |= 32;
+		if (cl.cmd.cursor_screen[1] >=  1) bits |= 64;
+	}
 
 	// set buttons and impulse
 	cl.cmd.buttons = bits;