X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_minelayer.qc;h=4e56d2d94ed99916ff21662fa019e944100785ab;hb=fa6d11afb076e48b635d146a631879221b6b6991;hp=ae8db2fedae929cb6a200302978eb9d285fb2cd0;hpb=f39f563dc8b308a110a98708ee1e71c5d02fcab6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_minelayer.qc b/qcsrc/server/w_minelayer.qc
index ae8db2fed..4e56d2d94 100644
--- a/qcsrc/server/w_minelayer.qc
+++ b/qcsrc/server/w_minelayer.qc
@@ -11,9 +11,9 @@ void spawnfunc_weapon_minelayer (void)
 	weapon_defaultspawnfunc(WEP_MINE_LAYER);
 }
 
-void W_Mine_Stick ()
+void W_Mine_Stick (entity to)
 {
-	spamsound (self, CHAN_PROJECTILE, "weapons/mine_stick.wav", VOL_BASE, ATTN_NORM);
+	spamsound (self, CH_SHOTS, "weapons/mine_stick.wav", VOL_BASE, ATTN_NORM);
 
 	// in order for mines to face properly when sticking to the ground, they must be a server side entity rather than a csqc projectile
 
@@ -25,6 +25,7 @@ void W_Mine_Stick ()
 	newmine.bot_dodgerating = self.bot_dodgerating;
 
 	newmine.owner = self.owner;
+	newmine.realowner = self.realowner;
 	setsize(newmine, '-4 -4 -4', '4 4 4');
 	setorigin(newmine, self.origin);
 	setmodel(newmine, "models/mine.md3");
@@ -51,27 +52,30 @@ void W_Mine_Stick ()
 
 	remove(self);
 	self = newmine;
+
+	if(to)
+		SetMovetypeFollow(self, to);
 }
 
 void W_Mine_Explode ()
 {
 	if(other.takedamage == DAMAGE_AIM)
 		if(other.classname == "player")
-			if(IsDifferentTeam(self.owner, other))
+			if(IsDifferentTeam(self.realowner, other))
 				if(other.deadflag == DEAD_NO)
 					if(IsFlying(other))
-						AnnounceTo(self.owner, "airshot");
+						AnnounceTo(self.realowner, "airshot");
 
 	self.event_damage = SUB_Null;
 	self.takedamage = DAMAGE_NO;
 
-	RadiusDamage (self, self.owner, autocvar_g_balance_minelayer_damage, autocvar_g_balance_minelayer_edgedamage, autocvar_g_balance_minelayer_radius, world, autocvar_g_balance_minelayer_force, self.projectiledeathtype, other);
+	RadiusDamage (self, self.realowner, autocvar_g_balance_minelayer_damage, autocvar_g_balance_minelayer_edgedamage, autocvar_g_balance_minelayer_radius, world, autocvar_g_balance_minelayer_force, self.projectiledeathtype, other);
 
-	if (self.owner.weapon == WEP_MINE_LAYER)
+	if (self.realowner.weapon == WEP_MINE_LAYER)
 	{
 		entity oldself;
 		oldself = self;
-		self = self.owner;
+		self = self.realowner;
 		if (!weapon_action(WEP_MINE_LAYER, WR_CHECKAMMO1))
 		{
 			self.cnt = WEP_MINE_LAYER;
@@ -80,7 +84,7 @@ void W_Mine_Explode ()
 		}
 		self = oldself;
 	}
-	self.owner.minelayer_mines -= 1;
+	self.realowner.minelayer_mines -= 1;
 	remove (self);
 }
 
@@ -89,16 +93,16 @@ void W_Mine_DoRemoteExplode ()
 	self.event_damage = SUB_Null;
 	self.takedamage = DAMAGE_NO;
 
-	if(self.movetype == MOVETYPE_NONE)
+	if(self.movetype == MOVETYPE_NONE || self.movetype == MOVETYPE_FOLLOW)
 		self.velocity = self.oldvelocity;
 
-	RadiusDamage (self, self.owner, autocvar_g_balance_minelayer_remote_damage, autocvar_g_balance_minelayer_remote_edgedamage, autocvar_g_balance_minelayer_remote_radius, world, autocvar_g_balance_minelayer_remote_force, self.projectiledeathtype | HITTYPE_BOUNCE, world);
+	RadiusDamage (self, self.realowner, autocvar_g_balance_minelayer_remote_damage, autocvar_g_balance_minelayer_remote_edgedamage, autocvar_g_balance_minelayer_remote_radius, world, autocvar_g_balance_minelayer_remote_force, self.projectiledeathtype | HITTYPE_BOUNCE, world);
 
-	if (self.owner.weapon == WEP_MINE_LAYER)
+	if (self.realowner.weapon == WEP_MINE_LAYER)
 	{
 		entity oldself;
 		oldself = self;
-		self = self.owner;
+		self = self.realowner;
 		if (!weapon_action(WEP_MINE_LAYER, WR_CHECKAMMO1))
 		{
 			self.cnt = WEP_MINE_LAYER;
@@ -107,16 +111,16 @@ void W_Mine_DoRemoteExplode ()
 		}
 		self = oldself;
 	}
-	self.owner.minelayer_mines -= 1;
+	self.realowner.minelayer_mines -= 1;
 	remove (self);
 }
 
 void W_Mine_RemoteExplode ()
 {
-	if(self.owner.deadflag == DEAD_NO)
+	if(self.realowner.deadflag == DEAD_NO)
 		if((self.spawnshieldtime >= 0)
 			? (time >= self.spawnshieldtime) // timer
-			: (vlen(NearestPointOnBox(self.owner, self.origin) - self.origin) > autocvar_g_balance_minelayer_remote_radius) // safety device
+			: (vlen(NearestPointOnBox(self.realowner, self.origin) - self.origin) > autocvar_g_balance_minelayer_remote_radius) // safety device
 		)
 		{
 			W_Mine_DoRemoteExplode();
@@ -132,7 +136,7 @@ void W_Mine_ProximityExplode ()
 		head = findradius(self.origin, autocvar_g_balance_minelayer_radius);
 		while(head)
 		{
-			if(head == self.owner || !IsDifferentTeam(head, self.owner))
+			if(head == self.realowner || !IsDifferentTeam(head, self.realowner))
 				return;
 			head = head.chain;
 		}
@@ -146,7 +150,7 @@ float W_Mine_Count(entity e)
 {
 	float minecount;
 	entity mine;
-	for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.owner == e)
+	for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.realowner == e)
 		minecount += 1;
 		
 	return minecount;
@@ -157,20 +161,29 @@ void W_Mine_Think (void)
 	entity head;
 
 	self.nextthink = time;
+
+	if(self.movetype == MOVETYPE_FOLLOW)
+	{
+		if(LostMovetypeFollow(self))
+		{
+			UnsetMovetypeFollow(self);
+			self.movetype = MOVETYPE_NONE;
+		}
+	}
 	
 	// our lifetime has expired, it's time to die - mine_time just allows us to play a sound for this
 	// TODO: replace this mine_trigger.wav sound with a real countdown
 	if ((time > self.cnt) && (!self.mine_time))
 	{
 		if(autocvar_g_balance_minelayer_lifetime_countdown > 0)
-			spamsound (self, CHAN_PROJECTILE, "weapons/mine_trigger.wav", VOL_BASE, ATTN_NORM);
+			spamsound (self, CH_SHOTS, "weapons/mine_trigger.wav", VOL_BASE, ATTN_NORM);
 		self.mine_time = time + autocvar_g_balance_minelayer_lifetime_countdown;
 		self.mine_explodeanyway = 1; // make the mine super aggressive -- Samual: Rather, make it not care if a team mate is near.
 	}
 
 	// a player's mines shall explode if he disconnects or dies
 	// TODO: Do this on team change too -- Samual: But isn't a player killed when they switch teams?
-	if(self.owner.classname != "player" || self.owner.deadflag != DEAD_NO)
+	if(self.realowner.classname != "player" || self.realowner.deadflag != DEAD_NO)
 	{
 		other = world;
 		self.projectiledeathtype |= HITTYPE_BOUNCE;
@@ -183,10 +196,10 @@ void W_Mine_Think (void)
 	while(head)
 	{
 		if(head.classname == "player" && head.deadflag == DEAD_NO)
-		if(head != self.owner && IsDifferentTeam(head, self.owner)) // don't trigger for team mates
+		if(head != self.realowner && IsDifferentTeam(head, self.realowner)) // don't trigger for team mates
 		if(!self.mine_time)
 		{
-			spamsound (self, CHAN_PROJECTILE, "weapons/mine_trigger.wav", VOL_BASE, ATTN_NORM);
+			spamsound (self, CH_SHOTS, "weapons/mine_trigger.wav", VOL_BASE, ATTN_NORM);
 			self.mine_time = time + autocvar_g_balance_minelayer_time;
 		}
 		head = head.chain;
@@ -200,19 +213,28 @@ void W_Mine_Think (void)
 	}
 
 	// remote detonation
-	if (self.owner.weapon == WEP_MINE_LAYER)
-	if (self.owner.deadflag == DEAD_NO)
+	if (self.realowner.weapon == WEP_MINE_LAYER)
+	if (self.realowner.deadflag == DEAD_NO)
 	if (self.minelayer_detonate)
 		W_Mine_RemoteExplode();
 }
 
 void W_Mine_Touch (void)
 {
+	if(self.movetype == MOVETYPE_NONE || self.movetype == MOVETYPE_FOLLOW)
+		return; // we're already a stuck mine, why do we get called? TODO does this even happen?
+
 	PROJECTILE_TOUCH;
-	if(!other || (other.takedamage != DAMAGE_AIM && other.movetype == MOVETYPE_NONE))
-		W_Mine_Stick();
-	else if(self.movetype != MOVETYPE_NONE) // don't unstick a locked mine when someone touches it
-		self.velocity = '0 0 0';
+
+	if(other && other.classname == "player" && other.deadflag == DEAD_NO)
+	{
+		// hit a player
+		// don't stick
+	}
+	else
+	{
+		W_Mine_Stick(other);
+	}
 }
 
 void W_Mine_Damage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
@@ -245,11 +267,11 @@ void W_Mine_Attack (void)
 
 	W_DecreaseAmmo(ammo_rockets, autocvar_g_balance_minelayer_ammo, autocvar_g_balance_minelayer_reload_ammo);
 
-	W_SetupShot_ProjectileSize (self, '-4 -4 -4', '4 4 4', FALSE, 5, "weapons/mine_fire.wav", CHAN_WEAPON, autocvar_g_balance_minelayer_damage);
+	W_SetupShot_ProjectileSize (self, '-4 -4 -4', '4 4 4', FALSE, 5, "weapons/mine_fire.wav", CH_WEAPON_A, autocvar_g_balance_minelayer_damage);
 	pointparticles(particleeffectnum("rocketlauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1);
 
 	mine = WarpZone_RefSys_SpawnSameRefSys(self);
-	mine.owner = self;
+	mine.owner = mine.realowner = self;
 	if(autocvar_g_balance_minelayer_detonatedelay >= 0)
 		mine.spawnshieldtime = time + autocvar_g_balance_minelayer_detonatedelay;
 	else
@@ -301,7 +323,7 @@ float W_PlacedMines(float detonate)
 	entity mine;
 	float minfound;
 
-	for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.owner == self)
+	for(mine = world; (mine = find(mine, classname, "mine")); ) if(mine.realowner == self)
 	{
 		if(detonate)
 		{
@@ -343,7 +365,7 @@ float w_minelayer(float req)
 			mine = find(world, classname, "mine");
 			while (mine)
 			{
-				if (mine.owner != self)
+				if (mine.realowner != self)
 				{
 					mine = find(mine, classname, "mine");
 					continue;
@@ -374,7 +396,7 @@ float w_minelayer(float req)
 			mine = find(world, classname, "mine");
 			while (mine)
 			{
-				if (mine.owner != self)
+				if (mine.realowner != self)
 				{
 					mine = find(mine, classname, "mine");
 					continue;
@@ -437,7 +459,7 @@ float w_minelayer(float req)
 		if (self.BUTTON_ATCK2)
 		{
 			if(W_PlacedMines(TRUE))
-				sound (self, CHAN_WEAPON2, "weapons/mine_det.wav", VOL_BASE, ATTN_NORM);
+				sound (self, CH_WEAPON_B, "weapons/mine_det.wav", VOL_BASE, ATTN_NORM);
 		}
 	}
 	else if (req == WR_PRECACHE)
@@ -491,7 +513,7 @@ float w_minelayer(float req)
 		org2 = w_org + w_backoff * 12;
 		pointparticles(particleeffectnum("rocket_explode"), org2, '0 0 0', 1);
 		if(!w_issilent)
-			sound(self, CHAN_PROJECTILE, "weapons/mine_exp.wav", VOL_BASE, ATTN_NORM);
+			sound(self, CH_SHOTS, "weapons/mine_exp.wav", VOL_BASE, ATTN_NORM);
 	}
 	else if(req == WR_PRECACHE)
 	{