X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_plats.qc;h=7c21c4e2e396158ffa18f8e46a639fe82ce8e7e3;hb=c8f6e9084a329db9597364ee96006c7c427a82b6;hp=a556d6d0bb192dd72d9417d2535a7eafa3e82aac;hpb=5bf53ba7af3a48304314d60bc3a4389c9f1d6586;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_plats.qc b/qcsrc/server/t_plats.qc
index a556d6d0b..7c21c4e2e 100644
--- a/qcsrc/server/t_plats.qc
+++ b/qcsrc/server/t_plats.qc
@@ -57,7 +57,17 @@ void plat_spawn_inside_trigger()
 		tmax_y = tmin_y + 1;
 	}
 
-	setsize (trigger, tmin, tmax);
+	if(tmin_x < tmax_x)
+		if(tmin_y < tmax_y)
+			if(tmin_z < tmax_z)
+			{
+				setsize (trigger, tmin, tmax);
+				return;
+			}
+
+	// otherwise, something is fishy...
+	remove(trigger);
+	objerror("plat_spawn_inside_trigger: platform has odd size or lip, can't spawn");
 }
 
 void plat_hit_top()
@@ -148,7 +158,7 @@ void plat_crush()
 
 void plat_use()
 {
-	self.use = SUB_Null;
+	self.use = func_null;
 	if (self.state != 4)
 		objerror ("plat_use: not in up state");
 	plat_go_down();
@@ -235,10 +245,10 @@ void spawnfunc_func_plat()
 	self.pos2 = self.origin;
 	self.pos2_z = self.origin_z - self.height;
 
-	plat_spawn_inside_trigger ();	// the "start moving" trigger
-
 	self.reset = plat_reset;
 	plat_reset();
+
+	plat_spawn_inside_trigger ();	// the "start moving" trigger
 }
 
 
@@ -404,7 +414,7 @@ void spawnfunc_func_rotating()
 
 	// wait for targets to spawn
 	self.nextthink = self.ltime + 999999999;
-	self.think = SUB_Null;
+	self.think = SUB_NullThink; // for PushMove
 
 	// TODO make a reset function for this one
 }
@@ -485,7 +495,7 @@ void spawnfunc_func_bobbing()
 	controller.nextthink = time + 1;
 	controller.think = func_bobbing_controller_think;
 	self.nextthink = self.ltime + 999999999;
-	self.think = SUB_Null;
+	self.think = SUB_NullThink; // for PushMove
 
 	// Savage: Reduce bandwith, critical on e.g. nexdm02
 	self.effects |= EF_LOWPRECISION;
@@ -562,7 +572,7 @@ void spawnfunc_func_pendulum()
 	controller.nextthink = time + 1;
 	controller.think = func_pendulum_controller_think;
 	self.nextthink = self.ltime + 999999999;
-	self.think = SUB_Null;
+	self.think = SUB_NullThink; // for PushMove
 
 	//self.effects |= EF_LOWPRECISION;
 
@@ -1215,24 +1225,32 @@ entity spawn_field(vector fmins, vector fmaxs)
 }
 
 
-float EntitiesTouching(entity e1, entity e2)
+entity LinkDoors_nextent(entity cur, entity near, entity pass)
 {
-	if (e1.absmin_x > e2.absmax_x)
+	while((cur = find(cur, classname, self.classname)) && ((cur.spawnflags & 4) || cur.enemy))
+	{
+	}
+	return cur;
+}
+
+float LinkDoors_isconnected(entity e1, entity e2, entity pass)
+{
+	float DELTA = 4;
+	if (e1.absmin_x > e2.absmax_x + DELTA)
 		return FALSE;
-	if (e1.absmin_y > e2.absmax_y)
+	if (e1.absmin_y > e2.absmax_y + DELTA)
 		return FALSE;
-	if (e1.absmin_z > e2.absmax_z)
+	if (e1.absmin_z > e2.absmax_z + DELTA)
 		return FALSE;
-	if (e1.absmax_x < e2.absmin_x)
+	if (e2.absmin_x > e1.absmax_x + DELTA)
 		return FALSE;
-	if (e1.absmax_y < e2.absmin_y)
+	if (e2.absmin_y > e1.absmax_y + DELTA)
 		return FALSE;
-	if (e1.absmax_z < e2.absmin_z)
+	if (e2.absmin_z > e1.absmax_z + DELTA)
 		return FALSE;
 	return TRUE;
 }
 
-
 /*
 =============
 LinkDoors
@@ -1242,7 +1260,7 @@ LinkDoors
 */
 void LinkDoors()
 {
-	entity	t, starte;
+	entity	t;
 	vector	cmins, cmaxs;
 
 	if (self.enemy)
@@ -1262,68 +1280,70 @@ void LinkDoors()
 		return;		// don't want to link this door
 	}
 
-	cmins = self.absmin;
-	cmaxs = self.absmax;
-
-	starte = self;
-	t = self;
+	FindConnectedComponent(self, enemy, LinkDoors_nextent, LinkDoors_isconnected, world);
 
-	do
+	// set owner, and make a loop of the chain
+	dprint("LinkDoors: linking doors:");
+	for(t = self; ; t = t.enemy)
 	{
-		self.owner = starte;			// master door
-
-		if (self.health)
-			starte.health = self.health;
-		IFTARGETED
-			starte.targetname = self.targetname;
-		if (self.message != "")
-			starte.message = self.message;
-
-		t = find(t, classname, self.classname);
-		if (!t)
+		dprint(" ", etos(t));
+		t.owner = self;
+		if(t.enemy == world)
 		{
-			self.enemy = starte;		// make the chain a loop
-
-		// shootable, or triggered doors just needed the owner/enemy links,
-		// they don't spawn a field
-
-			self = self.owner;
+			t.enemy = self;
+			break;
+		}
+	}
+	dprint("\n");
 
-			if (self.health)
-				return;
-			IFTARGETED
-				return;
-			if (self.items)
-				return;
+	// collect health, targetname, message, size
+	cmins = self.absmin;
+	cmaxs = self.absmax;
+	for(t = self; ; t = t.enemy)
+	{
+		if(t.health && !self.health)
+			self.health = t.health;
+		if(t.targetname && !self.targetname)
+			self.targetname = t.targetname;
+		if(t.message != "" && self.message == "")
+			self.message = t.message;
+		if (t.absmin_x < cmins_x)
+			cmins_x = t.absmin_x;
+		if (t.absmin_y < cmins_y)
+			cmins_y = t.absmin_y;
+		if (t.absmin_z < cmins_z)
+			cmins_z = t.absmin_z;
+		if (t.absmax_x > cmaxs_x)
+			cmaxs_x = t.absmax_x;
+		if (t.absmax_y > cmaxs_y)
+			cmaxs_y = t.absmax_y;
+		if (t.absmax_z > cmaxs_z)
+			cmaxs_z = t.absmax_z;
+		if(t.enemy == self)
+			break;
+	}
 
-			self.owner.trigger_field = spawn_field(cmins, cmaxs);
+	// distribute health, targetname, message
+	for(t = self; t; t = t.enemy)
+	{
+		t.health = self.health;
+		t.targetname = self.targetname;
+		t.message = self.message;
+		if(t.enemy == self)
+			break;
+	}
 
-			return;
-		}
+	// shootable, or triggered doors just needed the owner/enemy links,
+	// they don't spawn a field
 
-		if (EntitiesTouching(self,t))
-		{
-			if (t.enemy)
-				objerror ("cross connected doors");
-
-			self.enemy = t;
-			self = t;
-
-			if (t.absmin_x < cmins_x)
-				cmins_x = t.absmin_x;
-			if (t.absmin_y < cmins_y)
-				cmins_y = t.absmin_y;
-			if (t.absmin_z < cmins_z)
-				cmins_z = t.absmin_z;
-			if (t.absmax_x > cmaxs_x)
-				cmaxs_x = t.absmax_x;
-			if (t.absmax_y > cmaxs_y)
-				cmaxs_y = t.absmax_y;
-			if (t.absmax_z > cmaxs_z)
-				cmaxs_z = t.absmax_z;
-		}
-	} while (1 );
+	if (self.health)
+		return;
+	IFTARGETED
+		return;
+	if (self.items)
+		return;
 
+	self.trigger_field = spawn_field(cmins, cmaxs);
 }
 
 
@@ -1368,7 +1388,8 @@ void door_reset()
 	setorigin(self, self.pos1);
 	self.velocity = '0 0 0';
 	self.state = STATE_BOTTOM;
-	self.think = SUB_Null;
+	self.think = func_null;
+	self.nextthink = 0;
 }
 
 // spawnflags require key (for now only func_door)
@@ -1480,7 +1501,8 @@ void door_rotating_reset()
 	self.angles = self.pos1;
 	self.avelocity = '0 0 0';
 	self.state = STATE_BOTTOM;
-	self.think = SUB_Null;
+	self.think = func_null;
+	self.nextthink = 0;
 }
 
 void door_rotating_init_startopen()
@@ -1749,7 +1771,8 @@ void secret_reset()
 		self.takedamage = DAMAGE_YES;
 	}
 	setorigin(self, self.oldorigin);
-	self.think = SUB_Null;
+	self.think = func_null;
+	self.nextthink = 0;
 }
 
 /*QUAKED spawnfunc_func_door_secret (0 .5 .8) ? open_once 1st_left 1st_down no_shoot always_shoot
@@ -1889,7 +1912,7 @@ void spawnfunc_func_fourier()
 	controller.nextthink = time + 1;
 	controller.think = func_fourier_controller_think;
 	self.nextthink = self.ltime + 999999999;
-	self.think = SUB_Null;
+	self.think = SUB_NullThink; // for PushMove
 
 	// Savage: Reduce bandwith, critical on e.g. nexdm02
 	self.effects |= EF_LOWPRECISION;
@@ -1986,7 +2009,7 @@ void func_vectormamamam_findtarget()
 	if(!self.wp00 && !self.wp01 && !self.wp02 && !self.wp03)
 		objerror("No reference entity found, so there is nothing to move. Aborting.");
 
-	self.destvec = self.origin - func_vectormamamam_origin(self.owner, 0);
+	self.destvec = self.origin - func_vectormamamam_origin(self, 0);
 
 	entity controller;
 	controller = spawn();
@@ -2045,7 +2068,7 @@ void spawnfunc_func_vectormamamam()
 
 	// wait for targets to spawn
 	self.nextthink = self.ltime + 999999999;
-	self.think = SUB_Null;
+	self.think = SUB_NullThink; // for PushMove
 
 	// Savage: Reduce bandwith, critical on e.g. nexdm02
 	self.effects |= EF_LOWPRECISION;
@@ -2065,7 +2088,7 @@ void conveyor_think()
 
 	if(self.state)
 	{
-		for(e = findradius((self.absmin + self.absmax) * 0.5, vlen(self.absmax - self.absmin) * 0.5); e; e = e.chain)
+		for(e = findradius((self.absmin + self.absmax) * 0.5, vlen(self.absmax - self.absmin) * 0.5 + 1); e; e = e.chain)
 			if(!e.conveyor.state)
 				if(isPushable(e))
 				{