X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fw_seeker.qc;h=975449f5d10c723c5fb765204c66641ae277e0c8;hb=aba5ddce2b36b71cbd7d6f0bdf39b9cae573e6b0;hp=f5a3e3b1678fe5e4092700003e838c0c7856e1e2;hpb=b41f7ee415c9cc35d6304ca237986a9e445ffd4c;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index f5a3e3b16..975449f5d 100644
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -12,7 +12,7 @@ REGISTER_WEAPON(SEEKER, w_seeker, IT_ROCKETS, 8, WEP_FLAG_MUTATORBLOCKED | WEP_F
 // ============================
 void Seeker_Missile_Explode ()
 {
-	self.event_damage = SUB_Null;
+	self.event_damage = func_null;
 	RadiusDamage (self, self.realowner, autocvar_g_balance_seeker_missile_damage, autocvar_g_balance_seeker_missile_edgedamage, autocvar_g_balance_seeker_missile_radius, world, autocvar_g_balance_seeker_missile_force, self.projectiledeathtype, other);
 
 	remove (self);
@@ -207,6 +207,8 @@ void Seeker_Fire_Missile(vector f_diff, entity m_target)
 	setsize (missile, '-4 -4 -4', '4 4 4');
 	missile.movetype    = MOVETYPE_FLYMISSILE;
 	missile.flags       = FL_PROJECTILE;
+	missile.missile_flags = MIF_SPLASH | MIF_GUIDED_TAG;
+	
 	W_SETUPPROJECTILEVELOCITY_UP(missile, g_balance_seeker_missile);
 
 	missile.angles = vectoangles (missile.velocity);
@@ -221,7 +223,7 @@ void Seeker_Fire_Missile(vector f_diff, entity m_target)
 // ============================
 void Seeker_Flac_Explode ()
 {
-	self.event_damage = SUB_Null;
+	self.event_damage = func_null;
 
 	RadiusDamage (self, self.realowner, autocvar_g_balance_seeker_flac_damage, autocvar_g_balance_seeker_flac_edgedamage, autocvar_g_balance_seeker_flac_radius, world, autocvar_g_balance_seeker_flac_force, self.projectiledeathtype, other);
 
@@ -279,6 +281,7 @@ void Seeker_Fire_Flac()
 	missile.projectiledeathtype = WEP_SEEKER;
 	missile.projectiledeathtype = WEP_SEEKER | HITTYPE_SECONDARY;
 	missile.flags 				= FL_PROJECTILE;
+	missile.missile_flags       = MIF_SPLASH; 
 	
 	// csqc projectiles
 	//missile.angles 				= vectoangles (missile.velocity);	
@@ -423,7 +426,7 @@ void Seeker_Tag_Touch()
 
 	te_knightspike(org2);
 
-	self.event_damage = SUB_Null;
+	self.event_damage = func_null;
 	Damage_DamageInfo(self.origin, 0, 0, 0, self.velocity, WEP_SEEKER | HITTYPE_HEADSHOT, other.species, self);
 
 	if (other.takedamage == DAMAGE_AIM && other.deadflag == DEAD_NO)
@@ -492,14 +495,15 @@ void Seeker_Fire_Tag()
 	missile.solid           = SOLID_BBOX;
 
 	missile.takedamage       = DAMAGE_YES;
-	missile.event_damage    = Seeker_Tag_Explode;
-	missile.health          = autocvar_g_balance_seeker_tag_health;
+	missile.event_damage     = Seeker_Tag_Damage;
+	missile.health           = autocvar_g_balance_seeker_tag_health;
 	missile.damageforcescale = autocvar_g_balance_seeker_tag_damageforcescale;
 
 	setorigin (missile, w_shotorg);
 	setsize (missile, '-2 -2 -2', '2 2 2');
 
 	missile.flags       = FL_PROJECTILE;
+	//missile.missile_flags = MIF_..?; 
 
 	missile.movetype    = MOVETYPE_FLY;
 	W_SETUPPROJECTILEVELOCITY(missile, g_balance_seeker_tag);