X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_input.c;h=1a0704d70dfa7785ea1dd72076547bd105fac079;hb=db7cb0d2dd2d8aa7fb7dba7b9b6bf193d8df6d34;hp=d4ab8a01d5bf556a4b7ac01a73a0aa5bd7967753;hpb=2e6f913682aef4d97a28375d7a0085d61143779e;p=xonotic%2Fdarkplaces.git

diff --git a/cl_input.c b/cl_input.c
index d4ab8a01..1a0704d7 100644
--- a/cl_input.c
+++ b/cl_input.c
@@ -423,6 +423,7 @@ cvar_t cl_pitchspeed = {CVAR_SAVE, "cl_pitchspeed","150","keyboard pitch turning
 cvar_t cl_anglespeedkey = {CVAR_SAVE, "cl_anglespeedkey","1.5","how much +speed multiplies keyboard turning speed"};
 
 cvar_t cl_movement = {CVAR_SAVE, "cl_movement", "0", "enables clientside prediction of your player movement"};
+cvar_t cl_movement_replay = {0, "cl_movement_replay", "1", "use engine prediction"};
 cvar_t cl_movement_nettimeout = {CVAR_SAVE, "cl_movement_nettimeout", "0.3", "stops predicting moves when server is lagging badly (avoids major performance problems), timeout in seconds"};
 cvar_t cl_movement_minping = {CVAR_SAVE, "cl_movement_minping", "0", "whether to use prediction when ping is lower than this value in milliseconds"};
 cvar_t cl_movement_track_canjump = {CVAR_SAVE, "cl_movement_track_canjump", "1", "track if the player released the jump key between two jumps to decide if he is able to jump or not; when off, this causes some \"sliding\" slightly above the floor when the jump key is held too long; if the mod allows repeated jumping by holding space all the time, this has to be set to zero too"};
@@ -622,17 +623,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 +654,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)
 	{
@@ -1075,7 +1075,7 @@ void CL_ClientMovement_Physics_Swim(cl_clientmovement_state_t *s)
 				s->velocity[2] =  80;
 			else
 			{
-				if (gamemode == GAME_NEXUIZ)
+				if (gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
 					s->velocity[2] = 200;
 				else
 					s->velocity[2] = 100;
@@ -1349,7 +1349,7 @@ void CL_ClientMovement_Physics_Walk(cl_clientmovement_state_t *s)
 				if (cls.protocol == PROTOCOL_QUAKEWORLD)
 					trace = CL_TraceBox(neworigin2, s->mins, s->maxs, neworigin3, MOVE_NORMAL, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP, true, true, NULL, false);
 				else
-					trace = CL_TraceLine(neworigin2, neworigin3, MOVE_NORMAL, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP, true, true, NULL, false);
+					trace = CL_TraceLine(neworigin2, neworigin3, MOVE_NORMAL, NULL, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY | SUPERCONTENTS_PLAYERCLIP, true, true, NULL, false, false);
 				if (trace.fraction == 1 && !trace.startsolid)
 					friction *= cl.movevars_edgefriction;
 			}
@@ -1550,6 +1550,9 @@ void CL_ClientMovement_Replay(void)
 	if (cl.movement_predicted && !cl.movement_replay)
 		return;
 
+	if (!cl_movement_replay.integer)
+		return;
+
 	// set up starting state for the series of moves
 	memset(&s, 0, sizeof(s));
 	VectorCopy(cl.entities[cl.playerentity].state_current.origin, s.origin);
@@ -1751,10 +1754,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;
@@ -1796,7 +1802,7 @@ void CL_SendMove(void)
 		break;
 	case PROTOCOL_DARKPLACES6:
 	case PROTOCOL_DARKPLACES7:
-		// FIXME: cl.cmd.buttons & 16 is +button5, Nexuiz specific
+		// FIXME: cl.cmd.buttons & 16 is +button5, Nexuiz/Xonotic specific
 		cl.cmd.crouch = (cl.cmd.buttons & 16) != 0;
 		break;
 	case PROTOCOL_UNKNOWN:
@@ -1908,9 +1914,17 @@ void CL_SendMove(void)
 			// 5 bytes
 			MSG_WriteByte (&buf, clc_move);
 			MSG_WriteFloat (&buf, cl.cmd.time); // last server packet time
-			// 3 bytes
-			for (i = 0;i < 3;i++)
-				MSG_WriteAngle8i (&buf, cl.cmd.viewangles[i]);
+			// 3 bytes (6 bytes in proquake)
+			if (cls.proquake_servermod == 1) // MOD_PROQUAKE
+			{
+				for (i = 0;i < 3;i++)
+					MSG_WriteAngle16i (&buf, cl.cmd.viewangles[i]);
+			}
+			else
+			{
+				for (i = 0;i < 3;i++)
+					MSG_WriteAngle8i (&buf, cl.cmd.viewangles[i]);
+			}
 			// 6 bytes
 			MSG_WriteCoord16i (&buf, cl.cmd.forwardmove);
 			MSG_WriteCoord16i (&buf, cl.cmd.sidemove);
@@ -2166,6 +2180,7 @@ void CL_InitInput (void)
 
 	Cvar_RegisterVariable(&cl_movecliptokeyboard);
 	Cvar_RegisterVariable(&cl_movement);
+	Cvar_RegisterVariable(&cl_movement_replay);
 	Cvar_RegisterVariable(&cl_movement_nettimeout);
 	Cvar_RegisterVariable(&cl_movement_minping);
 	Cvar_RegisterVariable(&cl_movement_track_canjump);