added r_rtworld, r_rtworldshadows, r_rtdlight, r_rtdlightshadows, and r_lightmapinten...

[xonotic/darkplaces.git] / cl_input.c

diff --git a/cl_input.c b/cl_input.c
index 2948b61af2c918612e0ec54f4bb7b29a05267223..9908c9179dca13cc40cda5063336a3c97e37fd68 100644 (file)
--- a/cl_input.c
+++ b/cl_input.c
@@ -77,7 +77,7 @@ void KeyDown (kbutton_t *b)
                b->down[1] = k;
        else
        {
                b->down[1] = k;
        else
        {

-               Con_Printf ("Three keys down for a button!\n");
+               Con_Print("Three keys down for a button!\n");

                return;
        }
 
                return;
        }
 


@@ -385,38 +385,33 @@ void CL_SendMove(usercmd_t *cmd)
 
        MSG_WriteFloat (&buf, cl.mtime[0]);     // so server can get ping times
 
 
        MSG_WriteFloat (&buf, cl.mtime[0]);     // so server can get ping times
 

-       if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
+       if (cl.protocol == PROTOCOL_QUAKE)

        {
                for (i = 0;i < 3;i++)
        {
                for (i = 0;i < 3;i++)

-                       MSG_WriteFloat (&buf, cl.viewangles[i]);
+                       MSG_WriteAngle8i (&buf, cl.viewangles[i]);

        }
        }

-       else if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES4)
+       else if (cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)

        {
        {

-               for (i=0 ; i<3 ; i++)
-                       MSG_WritePreciseAngle (&buf, cl.viewangles[i]);
+               for (i = 0;i < 3;i++)
+                       MSG_WriteAngle32f (&buf, cl.viewangles[i]);

        }
        }

-       else
+       else if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES4 || cl.protocol == PROTOCOL_DARKPLACES5)

        {
        {

-               for (i=0 ; i<3 ; i++)
-                       MSG_WriteAngle (&buf, cl.viewangles[i]);
+               for (i = 0;i < 3;i++)
+                       MSG_WriteAngle16i (&buf, cl.viewangles[i]);

        }
 
        }
 

-       MSG_WriteShort (&buf, forwardmove);
-       MSG_WriteShort (&buf, sidemove);
-       MSG_WriteShort (&buf, upmove);
+       MSG_WriteCoord16i (&buf, forwardmove);
+       MSG_WriteCoord16i (&buf, sidemove);
+       MSG_WriteCoord16i (&buf, upmove);

 
        forwardmove = sidemove = upmove = 0;
        // send button bits
        bits = 0;
 
 
        forwardmove = sidemove = upmove = 0;
        // send button bits
        bits = 0;
 

-       if ( in_attack.state & 3 )
-               bits |= 1;
-       in_attack.state &= ~2;
-
-       if (in_jump.state & 3)
-               bits |= 2;
-       in_jump.state &= ~2;

        // LordHavoc: added 6 new buttons
        // LordHavoc: added 6 new buttons

+       if (in_attack.state  & 3) bits |=   1;in_attack.state  &= ~2;
+       if (in_jump.state    & 3) bits |=   2;in_jump.state    &= ~2;

        if (in_button3.state & 3) bits |=   4;in_button3.state &= ~2;
        if (in_button4.state & 3) bits |=   8;in_button4.state &= ~2;
        if (in_button5.state & 3) bits |=  16;in_button5.state &= ~2;
        if (in_button3.state & 3) bits |=   4;in_button3.state &= ~2;
        if (in_button4.state & 3) bits |=   8;in_button4.state &= ~2;
        if (in_button5.state & 3) bits |=  16;in_button5.state &= ~2;


@@ -429,28 +424,16 @@ void CL_SendMove(usercmd_t *cmd)
        MSG_WriteByte (&buf, in_impulse);
        in_impulse = 0;
 
        MSG_WriteByte (&buf, in_impulse);
        in_impulse = 0;
 

-       if (cl.protocol == PROTOCOL_DARKPLACES1 || cl.protocol == PROTOCOL_DARKPLACES2 || cl.protocol == PROTOCOL_DARKPLACES3)
-       {
-               // LordHavoc: should we ack this on receipt instead?  would waste net bandwidth though
-               i = EntityFrame_MostRecentlyRecievedFrameNum(&cl.entitydatabase);
-               if (i > 0)
-               {
-                       MSG_WriteByte(&buf, clc_ackentities);
-                       MSG_WriteLong(&buf, i);
-               }
-       }
-       else
+       // FIXME: should ack latest 3 frames perhaps?
+       if (cl.latestframenum > 0)

        {
        {

-               if (cl.entitydatabase4)
-               {
-                       i = cl.entitydatabase4->ackframenum;
-                       if (cl_nodelta.integer)
-                               i = -1;
-                       if (developer_networkentities.integer >= 1)
-                               Con_Printf("send clc_ackentities %i\n", i);
-                       MSG_WriteByte(&buf, clc_ackentities);
-                       MSG_WriteLong(&buf, i);
-               }
+               i = cl.latestframenum;
+               if (cl_nodelta.integer)
+                       i = -1;
+               if (developer_networkentities.integer >= 1)
+                       Con_Printf("send clc_ackentities %i\n", i);
+               MSG_WriteByte(&buf, clc_ackentities);
+               MSG_WriteLong(&buf, i);

        }
 
        // deliver the message
        }
 
        // deliver the message


@@ -463,8 +446,9 @@ void CL_SendMove(usercmd_t *cmd)
 
        if (NetConn_SendUnreliableMessage(cls.netcon, &buf) == -1)
        {
 
        if (NetConn_SendUnreliableMessage(cls.netcon, &buf) == -1)
        {

-               Con_Printf("CL_SendMove: lost server connection\n");
+               Con_Print("CL_SendMove: lost server connection\n");

                CL_Disconnect();
                CL_Disconnect();

+               Host_ShutdownServer(false);

        }
 }
 
        }
 }