X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fweapons%2Fweapon%2Fmortar.qc;h=5f56f19db19b2080d7255318562d150ee2be1787;hb=b9671f63469586007314131f3f53728795c035cd;hp=7fdc4a6853fb514744c868aa765761584abab899;hpb=6e9c81c87d69e23957f16b541acb99bcb9be54bd;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/weapons/weapon/mortar.qc b/qcsrc/common/weapons/weapon/mortar.qc
index 7fdc4a685..5f56f19db 100644
--- a/qcsrc/common/weapons/weapon/mortar.qc
+++ b/qcsrc/common/weapons/weapon/mortar.qc
@@ -79,7 +79,7 @@ void W_Mortar_Grenade_Explode(entity this)
 	if(this.movetype == MOVETYPE_NONE)
 		this.velocity = this.oldvelocity;
 
-	RadiusDamage(this, this.realowner, WEP_CVAR_PRI(mortar, damage), WEP_CVAR_PRI(mortar, edgedamage), WEP_CVAR_PRI(mortar, radius), world, world, WEP_CVAR_PRI(mortar, force), this.projectiledeathtype, other);
+	RadiusDamage(this, this.realowner, WEP_CVAR_PRI(mortar, damage), WEP_CVAR_PRI(mortar, edgedamage), WEP_CVAR_PRI(mortar, radius), NULL, NULL, WEP_CVAR_PRI(mortar, force), this.projectiledeathtype, other);
 
 	remove(this);
 }
@@ -104,7 +104,7 @@ void W_Mortar_Grenade_Explode2(entity this)
 	if(this.movetype == MOVETYPE_NONE)
 		this.velocity = this.oldvelocity;
 
-	RadiusDamage(this, this.realowner, WEP_CVAR_SEC(mortar, damage), WEP_CVAR_SEC(mortar, edgedamage), WEP_CVAR_SEC(mortar, radius), world, world, WEP_CVAR_SEC(mortar, force), this.projectiledeathtype, other);
+	RadiusDamage(this, this.realowner, WEP_CVAR_SEC(mortar, damage), WEP_CVAR_SEC(mortar, edgedamage), WEP_CVAR_SEC(mortar, radius), NULL, NULL, WEP_CVAR_SEC(mortar, force), this.projectiledeathtype, other);
 
 	remove(this);
 }
@@ -133,7 +133,7 @@ void W_Mortar_Grenade_Think1(entity this)
 	this.nextthink = time;
 	if(time > this.cnt)
 	{
-		other = world;
+		other = NULL;
 		this.projectiledeathtype |= HITTYPE_BOUNCE;
 		W_Mortar_Grenade_Explode(this);
 		return;
@@ -362,7 +362,7 @@ METHOD(Mortar, wr_think, void(entity thiswep, entity actor, .entity weaponentity
         {
             bool nadefound = false;
             entity nade;
-            for(nade = world; (nade = find(nade, classname, "grenade")); ) if(nade.realowner == actor)
+            for(nade = NULL; (nade = find(nade, classname, "grenade")); ) if(nade.realowner == actor)
             {
                 if(!nade.gl_detonate_later)
                 {