From: Mario <mario.mario@y7mail.com>
Date: Sun, 25 Sep 2022 02:03:27 +0000 (+1000)
Subject: Merge branch 'master' into Mario/client_entnum
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5a191107af2c4150d9860514801feb3a9e9307e7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/client_entnum
---

5a191107af2c4150d9860514801feb3a9e9307e7
diff --cc qcsrc/lib/csqcmodel/cl_player.qc
index 6dc14918f,5521feae1..13f8374a0
--- a/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;
  }