Merge branch 'master' into Mario/client_entnum

diff --cc qcsrc/lib/csqcmodel/cl_model.qc
Simple merge

diff --cc qcsrc/lib/csqcmodel/cl_player.qc
index 6dc14918f13779a4ced8c357fe6ea5bc1d0ffb29,5521feae190c5a894a6bc5007ef36b362bb55cf6..13f8374a0d3e2995eaa174eb403fc3c390de880d
--- 1/qcsrc/lib/csqcmodel/cl_player.qc
--- 2/qcsrc/lib/csqcmodel/cl_player.qc
+++ b/qcsrc/lib/csqcmodel/cl_player.qc
@@@ -654,10 -679,11 +679,11 @@@ bool CSQCPlayer_PreUpdate(entity this
  
  bool CSQCPlayer_PostUpdate(entity this)
  {
 -      if (this.entnum != player_localnum + 1) return false;
 +      if (!(this.isplayermodel & ISPLAYER_LOCAL)) return false;
        csqcplayer = this;
        csqcplayer_status = CSQCPLAYERSTATUS_FROMSERVER;
-       cvar_settemp("cl_movement_replay", "0");
+       if (cvar("cl_movement_replay"))
+               cvar_settemp("cl_movement_replay", "0");
        this.entremove = CSQCPlayer_Remove;
        return true;
  }