From: Nick S <nick@teichisma.info>
Date: Thu, 24 Aug 2023 09:06:43 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/master' into morosophos/server-current4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=44935eb6ab78264d8a38e52e9eed3171833ee081;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into morosophos/server-current4
---

44935eb6ab78264d8a38e52e9eed3171833ee081
diff --cc qcsrc/common/mapobjects/func/door.qc
index ac1e0bee49,9751719cea..9afe3aaded
--- a/qcsrc/common/mapobjects/func/door.qc
+++ b/qcsrc/common/mapobjects/func/door.qc
@@@ -415,7 -415,9 +415,9 @@@ LinkDoor
  
  entity LinkDoors_nextent(entity cur, entity near, entity pass)
  {
- 	while((cur = find(cur, classname, pass.classname)) && ((cur.spawnflags & DOOR_DONT_LINK && !Q3COMPAT_COMMON) || cur.enemy))
 -	while((cur = find(cur, classname, pass.classname)) 
++	while((cur = find(cur, classname, pass.classname))
+ 	&& (((cur.spawnflags & DOOR_DONT_LINK) && !Q3COMPAT_COMMON) 
+ 	|| cur.enemy))
  	{
  	}
  	return cur;
@@@ -453,7 -455,8 +455,8 @@@ void LinkDoors(entity this
  		return;		// already linked by another door
  
  	// Q3 door linking is done for teamed doors only and is not affected by spawnflags or bmodel proximity
- 	if ((this.spawnflags & DOOR_DONT_LINK && !Q3COMPAT_COMMON) || (Q3COMPAT_COMMON && !this.team))
 -	if (((this.spawnflags & DOOR_DONT_LINK) && !Q3COMPAT_COMMON) 
++	if (((this.spawnflags & DOOR_DONT_LINK) && !Q3COMPAT_COMMON)
+ 	|| (Q3COMPAT_COMMON && !this.team))
  	{
  		this.owner = this.enemy = this;