fix strlennocol/strdecolorize on unusual strings like "foo^";

[xonotic/darkplaces.git] / host.c

diff --git a/host.c b/host.c
index 455f55d5b4e9b5093a8df0fe1d8635e28af9bd2b..735905cb1e69c0652da97f3ff66b0ac389459a61 100644 (file)
--- a/host.c
+++ b/host.c
@@ -418,7 +418,7 @@ if (crash = true), don't bother sending signofs
 void SV_DropClient(qboolean crash)
 {
        int i;
-       Con_Printf("Client \"%s\" dropped\n", host_client->name);
+       Con_Printf("Client \"%s^%i\" dropped\n", host_client->name, STRING_COLOR_DEFAULT);
 
        // make sure edict is not corrupt (from a level change for example)
        host_client->edict = PRVM_EDICT_NUM(host_client - svs.clients + 1);
@@ -789,16 +789,17 @@ void Host_Main(void)
                        // Collect input into cmd
                        CL_Input();
 
+                       // check for new packets
                        NetConn_ClientFrame();
 
-                       if (cls.state == ca_connected)
-                       {
-                               CL_ReadFromServer();
-                               // if running the server remotely, send intentions now after
-                               // the incoming messages have been read
-                               //if (!cl.islocalgame)
-                               //      CL_SendCmd();
-                       }
+                       // read a new frame from a demo if needed
+                       CL_ReadDemoMessage();
+
+                       // now that packets have been read, send input to server
+                       CL_SendMove();
+
+                       // update client world (interpolate entities, create trails, etc)
+                       CL_UpdateWorld();
 
                        // update video
                        if (host_speeds.integer)