cleaned up mouse input system

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index c2f433c61466dcfb59877ab16c2e8968a48765c9..30b275604c1db4386e04fe46e530bd9582c24a7f 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -197,6 +197,7 @@ void CL_Disconnect (void)
                NET_SendUnreliableMessage (cls.netcon, &cls.message);
                SZ_Clear (&cls.message);
                NET_Close (cls.netcon);
+               cls.state = ca_disconnected; // prevent this code from executing again during Host_ShutdownServer
                // if running a local server, shut it down
                if (sv.active)
                        Host_ShutdownServer(false);
@@ -226,6 +227,13 @@ Host should be either "local" or a net address to be passed on
 */
 void CL_EstablishConnection (char *host)
 {
+       sizebuf_t       buf;
+       qbyte   data[128];
+
+       buf.maxsize = 128;
+       buf.cursize = 0;
+       buf.data = data;
+
        if (cls.state == ca_dedicated)
                return;
 
@@ -242,6 +250,8 @@ void CL_EstablishConnection (char *host)
        cls.demonum = -1;                       // not in the demo loop now
        cls.state = ca_connected;
        cls.signon = 0;                         // need all the signon messages before playing
+
+       CL_ClearState ();
 }
 
 /*
@@ -287,44 +297,24 @@ should be put at.
 */
 static float CL_LerpPoint (void)
 {
-       float   f, frac;
+       float   f;
 
-       f = cl.mtime[0] - cl.mtime[1];
+       // dropped packet, or start of demo
+       if (cl.mtime[1] < cl.mtime[0] - 0.1)
+               cl.mtime[1] = cl.mtime[0] - 0.1;
+
+       cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]);
 
        // LordHavoc: lerp in listen games as the server is being capped below the client (usually)
+       f = cl.mtime[0] - cl.mtime[1];
        if (!f || cl_nolerp.integer || cls.timedemo || (sv.active && svs.maxclients == 1))
        {
                cl.time = cl.mtime[0];
                return 1;
        }
 
-       if (f > 0.1)
-       {       // dropped packet, or start of demo
-               cl.mtime[1] = cl.mtime[0] - 0.1;
-               f = 0.1;
-       }
-       frac = (cl.time - cl.mtime[1]) / f;
-//     Con_Printf ("frac: %f\n",frac);
-       if (frac < 0)
-       {
-               if (frac < -0.01)
-               {
-                       cl.time = cl.mtime[1];
-//                     Con_Printf ("low frac\n");
-               }
-               frac = 0;
-       }
-       else if (frac > 1)
-       {
-               if (frac > 1.01)
-               {
-                       cl.time = cl.mtime[0];
-//                     Con_Printf ("high frac\n");
-               }
-               frac = 1;
-       }
-
-       return frac;
+       f = (cl.time - cl.mtime[1]) / f;
+       return bound(0, f, 1);
 }
 
 static void CL_RelinkStaticEntities(void)
@@ -355,8 +345,6 @@ static void CL_RelinkNetworkEntities()
        else
                bobjoffset = 0;
 
-       CL_RelinkStaticEntities();
-
 // start on the entity after the world
        for (i = 1, ent = cl_entities + 1;i < MAX_EDICTS /*cl.num_entities*/;i++, ent++)
        {
@@ -607,7 +595,7 @@ static void CL_RelinkNetworkEntities()
                glowcolor = ent->state_current.glowcolor;
                if (glowsize)
                {
-                       byte *tempcolor = (byte *)&d_8to24table[glowcolor];
+                       qbyte *tempcolor = (qbyte *)&d_8to24table[glowcolor];
                        dlightcolor[0] += glowsize * tempcolor[0] * (1.0f / 255.0f);
                        dlightcolor[1] += glowsize * tempcolor[1] * (1.0f / 255.0f);
                        dlightcolor[2] += glowsize * tempcolor[2] * (1.0f / 255.0f);
@@ -648,13 +636,21 @@ static void CL_RelinkNetworkEntities()
        }
 }
 
-static void CL_LerpPlayerVelocity (void)
+void CL_LerpPlayer(float frac)
 {
        int i;
-       float frac, d;
+       float d;
 
-       // fraction from previous network update to current
-       frac = CL_LerpPoint ();
+       if (cl.entitydatabase.numframes)
+       {
+               cl.viewentorigin[0] = cl.viewentoriginold[0] + frac * (cl.viewentoriginnew[0] - cl.viewentoriginold[0]);
+               cl.viewentorigin[1] = cl.viewentoriginold[1] + frac * (cl.viewentoriginnew[1] - cl.viewentoriginold[1]);
+               cl.viewentorigin[2] = cl.viewentoriginold[2] + frac * (cl.viewentoriginnew[2] - cl.viewentoriginold[2]);
+       }
+       else
+               VectorCopy (cl_entities[cl.viewentity].render.origin, cl.viewentorigin);
+
+       cl.viewzoom = cl.viewzoomold + frac * (cl.viewzoomnew - cl.viewzoomold);
 
        for (i = 0;i < 3;i++)
                cl.velocity[i] = cl.mvelocity[1][i] + frac * (cl.mvelocity[0][i] - cl.mvelocity[1][i]);
@@ -751,13 +747,20 @@ static void CL_RelinkEffects()
 
 void CL_RelinkEntities (void)
 {
+       float frac;
+
+       // fraction from previous network update to current
+       frac = CL_LerpPoint ();
+
        CL_DecayLights ();
-       CL_LerpPlayerVelocity();
+       CL_RelinkStaticEntities();
        CL_RelinkNetworkEntities();
        TraceLine_ScanForBModels();
        CL_RelinkEffects();
        CL_MoveParticles();
        CL_UpdateTEnts();
+
+       CL_LerpPlayer(frac);
 }
 
 
@@ -828,12 +831,29 @@ void CL_SendCmd (void)
        // get basic movement from keyboard
                CL_BaseMove (&cmd);
 
+               IN_PreMove(); // OS independent code
+
        // allow mice or other external controllers to add to the move
                IN_Move (&cmd);
 
+               IN_PostMove(); // OS independent code
+
        // send the unreliable message
                CL_SendMove (&cmd);
        }
+       else
+       {
+               // LordHavoc: fix for NAT routing of netquake:
+               // bounce back a clc_nop message to the newly allocated server port,
+               // to establish a routing connection for incoming frames,
+               // the server waits for this before sending anything
+               if (realtime > cl.sendnoptime)
+               {
+                       Con_DPrintf("sending clc_nop to get server's attention\n");
+                       cl.sendnoptime = realtime + 3;
+                       MSG_WriteByte(&cls.message, clc_nop);
+               }
+       }
 
        if (cls.demoplayback)
        {