X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fwarpzonelib%2Fserver.qc;h=921b2ed58289df9fadff0acb3d409feca06d498f;hb=b3499b8b8d3cf35c151aa14f362fa9e777c27d97;hp=29f5dc8db11aaf218354895ed5bba94f53e76397;hpb=59c257eff12dbe51d08f3913b8c73102e3478a6e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index 29f5dc8db..921b2ed58 100644
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -22,13 +22,10 @@ void WarpZone_TeleportPlayer(entity teleporter, entity player, vector to, vector
 	player.fixangle = TRUE;
 	player.velocity = to_velocity;
 
-	if(player.effects & EF_TELEPORT_BIT)
-		player.effects &~= EF_TELEPORT_BIT;
-	else
-		player.effects |= EF_TELEPORT_BIT;
+	BITXOR_ASSIGN(player.effects, EF_TELEPORT_BIT);
 
 	if(player.classname == "player")
-		player.flags &~= FL_ONGROUND;
+		BITCLR_ASSIGN(player.flags, FL_ONGROUND);
 
 	WarpZone_PostTeleportPlayer_Callback(player);
 }
@@ -171,11 +168,11 @@ float WarpZone_Send(entity to, float sendflags)
 	// we must send this flag for clientside to match properly too
 	f = 0;
 	if(self.warpzone_isboxy)
-		f |= 1;
+		BITSET_ASSIGN(f, 1);
 	if(self.warpzone_fadestart)
-		f |= 2;
+		BITSET_ASSIGN(f, 2);
 	if(self.origin != '0 0 0')
-		f |= 4;
+		BITSET_ASSIGN(f, 4);
 	WriteByte(MSG_ENTITY, f);
 
 	// we need THESE to render the warpzone (and cull properly)...
@@ -224,9 +221,9 @@ float WarpZone_Camera_Send(entity to, float sendflags)
 	WriteByte(MSG_ENTITY, ENT_CLIENT_WARPZONE_CAMERA);
 
 	if(self.warpzone_fadestart)
-		f |= 2;
+		BITSET_ASSIGN(f, 2);
 	if(self.origin != '0 0 0')
-		f |= 4;
+		BITSET_ASSIGN(f, 4);
 	WriteByte(MSG_ENTITY, f);
 
 	// we need THESE to render the warpzone (and cull properly)...
@@ -411,7 +408,7 @@ void WarpZone_InitStep_UpdateTransform()
 		tex = getsurfacetexture(self, i_s);
 		if not(tex)
 			break; // this is beyond the last one
-		if(tex == "textures/common/trigger")
+		if(tex == "textures/common/trigger" || tex == "trigger")
 			continue;
 		n_t = getsurfacenumtriangles(self, i_s);
 		for(i_t = 0; i_t < n_t; ++i_t)
@@ -572,7 +569,7 @@ void spawnfunc_trigger_warpzone(void)
 		setsize(self, self.mins, self.maxs);
 	self.SendEntity = WarpZone_Send;
 	self.SendFlags = 0xFFFFFF;
-	self.effects |= EF_NODEPTHTEST;
+	BITSET_ASSIGN(self.effects, EF_NODEPTHTEST);
 	self.warpzone_next = warpzone_first;
 	warpzone_first = self;
 }