Merge branch 'master' into mirceakitsune/per_character_sounds

diff --combined qcsrc/server/cl_client.qc
index df700faafc8fda2cf9b02d63cc87e0ded350be0c,c4b8bb600ab8faa86251f23ac5a743d05f4759c7..ba363f0c0a273e32914981baea57a9b7fa30cd1c
--- 1/qcsrc/server/cl_client.qc
--- 2/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@@ -508,6 -508,7 +508,6 @@@ float Client_customizeentityforclient(
        return TRUE;
  }
  
 -void UpdatePlayerSounds();
  void setmodel_lod(entity e, string modelname)
  {
        string s;
@@@ -1058,7 -1059,6 +1058,6 @@@ float ClientInit_SendEntity(entity to, 
        WriteCoord(MSG_ENTITY, hook_shotorigin_x);
        WriteCoord(MSG_ENTITY, hook_shotorigin_y);
        WriteCoord(MSG_ENTITY, hook_shotorigin_z);
- 
        if(sv_foginterval && world.fog != "")
                WriteString(MSG_ENTITY, world.fog);
        else
@@@ -1099,10 -1099,11 +1098,11 @@@ void ClientInit_Spawn(
  {
        entity o;
        entity e;
+       e = spawn();
        e.classname = "clientinit";
        e.think = ClientInit_CheckUpdate;
-       e.nextthink = time;
        Net_LinkEntity(e, FALSE, 0, ClientInit_SendEntity);
+ 
        o = self;
        self = e;
        ClientInit_CheckUpdate();