X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Flib%2Fwarpzone%2Fclient.qc;h=7f8b0cdc837258a7bb5547d984afbcd960430baa;hp=fd0925db93f65720648b644818e06deb4bb82750;hb=d13b85731d2a23db27bb221646b3701a06e8f350;hpb=678388b78fdaad89fc8218dadf7007432b4153c3

diff --git a/qcsrc/lib/warpzone/client.qc b/qcsrc/lib/warpzone/client.qc
index fd0925db93..7f8b0cdc83 100644
--- a/qcsrc/lib/warpzone/client.qc
+++ b/qcsrc/lib/warpzone/client.qc
@@ -28,6 +28,8 @@ void WarpZone_Fade_PreDraw(entity this)
 void WarpZone_Touch(entity this, entity toucher);
 NET_HANDLE(ENT_CLIENT_WARPZONE, bool isnew)
 {
+	if(!warpzone_warpzones_exist)
+		cvar_settemp("r_water", "1"); // HACK for DarkPlaces: always enable reflections when a map has warpzones
 	warpzone_warpzones_exist = 1;
 	if (!this.enemy)
 	{
@@ -35,36 +37,25 @@ NET_HANDLE(ENT_CLIENT_WARPZONE, bool isnew)
 	}
 	this.classname = "trigger_warpzone";
 
+	if(isnew)
+		IL_PUSH(g_warpzones, this);
+
 	int f = ReadByte();
 	this.warpzone_isboxy = (f & 1);
 	if(f & 4)
 	{
-		this.origin_x = ReadCoord();
-		this.origin_y = ReadCoord();
-		this.origin_z = ReadCoord();
+		this.origin = ReadVector();
 	}
 	else
 		this.origin = '0 0 0';
 	this.modelindex = ReadShort();
-	this.mins_x = ReadCoord();
-	this.mins_y = ReadCoord();
-	this.mins_z = ReadCoord();
-	this.maxs_x = ReadCoord();
-	this.maxs_y = ReadCoord();
-	this.maxs_z = ReadCoord();
+	this.mins = ReadVector();
+	this.maxs = ReadVector();
 	this.scale = ReadByte() / 16;
-	this.enemy.oldorigin_x = ReadCoord();
-	this.enemy.oldorigin_y = ReadCoord();
-	this.enemy.oldorigin_z = ReadCoord();
-	this.enemy.avelocity_x = ReadCoord();
-	this.enemy.avelocity_y = ReadCoord();
-	this.enemy.avelocity_z = ReadCoord();
-	this.oldorigin_x = ReadCoord();
-	this.oldorigin_y = ReadCoord();
-	this.oldorigin_z = ReadCoord();
-	this.avelocity_x = ReadCoord();
-	this.avelocity_y = ReadCoord();
-	this.avelocity_z = ReadCoord();
+	this.enemy.oldorigin = ReadVector();
+	this.enemy.avelocity = ReadVector();
+	this.oldorigin = ReadVector();
+	this.avelocity = ReadVector();
 
 	if(f & 2)
 	{
@@ -89,38 +80,30 @@ NET_HANDLE(ENT_CLIENT_WARPZONE, bool isnew)
 	// engine currently wants this
 	setpredraw(this, WarpZone_Fade_PreDraw);
 
-	//this.move_touch = WarpZone_Touch;
+	//settouch(this, WarpZone_Touch);
 	return true;
 }
 
 NET_HANDLE(ENT_CLIENT_WARPZONE_CAMERA, bool isnew)
 {
+	if(!warpzone_cameras_exist)
+		cvar_settemp("r_water", "1"); // HACK for DarkPlaces: always enable reflections when a map has cameras
 	warpzone_cameras_exist = 1;
 	this.classname = "func_warpzone_camera";
 
 	int f = ReadByte();
 	if(f & 4)
 	{
-		this.origin_x = ReadCoord();
-		this.origin_y = ReadCoord();
-		this.origin_z = ReadCoord();
+		this.origin = ReadVector();
 	}
 	else
 		this.origin = '0 0 0';
 	this.modelindex = ReadShort();
-	this.mins_x = ReadCoord();
-	this.mins_y = ReadCoord();
-	this.mins_z = ReadCoord();
-	this.maxs_x = ReadCoord();
-	this.maxs_y = ReadCoord();
-	this.maxs_z = ReadCoord();
+	this.mins = ReadVector();
+	this.maxs = ReadVector();
 	this.scale = ReadByte() / 16;
-	this.oldorigin_x = ReadCoord();
-	this.oldorigin_y = ReadCoord();
-	this.oldorigin_z = ReadCoord();
-	this.avelocity_x = ReadCoord();
-	this.avelocity_y = ReadCoord();
-	this.avelocity_z = ReadCoord();
+	this.oldorigin = ReadVector();
+	this.avelocity = ReadVector();
 
 	if(f & 2)
 	{
@@ -154,10 +137,7 @@ void CL_RotateMoves(vector ang) = #638;
 NET_HANDLE(ENT_CLIENT_WARPZONE_TELEPORTED, bool isnew)
 {
 	this.classname = "warpzone_teleported";
-	vector v;
-	v.x = ReadCoord();
-	v.y = ReadCoord();
-	v.z = ReadCoord();
+	vector v = ReadVector();
 	return = true;
 	if (!isnew) return;
 	this.warpzone_transform = v;