- Added +FULLMASS.

Actors will be excluded from damage/radius thrusting of all sorts by
explosions or damage of any kind. They will also never deal impact
damage to other enemies, nor will they damage themselves from being too
close to a wall.

src/actor.h

@@ -344,6 +344,7 @@ enum
 	MF7_HARMFRIENDS		= 0x00000020,	// is allowed to harm friendly monsters.
 	MF7_BUDDHA			= 0x00000040,	// Behaves just like the buddha cheat. 
 	MF7_FOILBUDDHA		= 0x00000080,	// Similar to FOILINVUL, foils buddha mode.
+	MF7_FULLMASS		= 0x00000100,	// Thrusting functions do not take, and do not give thrust (damage) to actors with this flag.
 
 // --- mobj.renderflags ---
 

src/p_interaction.cpp

@@ -1097,6 +1097,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 		&& !(target->flags & MF_NOCLIP)
 		&& !(inflictor->flags2 & MF2_NODMGTHRUST)
 		&& !(flags & DMG_THRUSTLESS)
+		&& !(target->flags7 & MF7_FULLMASS)
 		&& (source == NULL || source->player == NULL || !(source->flags2 & MF2_NODMGTHRUST)))
 	{
 		int kickback;
@@ -1324,7 +1325,7 @@ int P_DamageMobj (AActor *target, AActor *inflictor, AActor *source, int damage,
 	if (target->health <= 0)
 	{ 
 		if ((target->flags7 & MF7_BUDDHA) && (damage < TELEFRAG_DAMAGE) && (!(inflictor->flags3 & MF7_FOILBUDDHA) && !(flags & DMG_FOILBUDDHA)))
-		{ //Make sure FOILINVUL flags work here too for monsters. Or perhaps consider a FOILBUDDHA flag...
+		{ //FOILBUDDHA or Telefrag damage must kill it.
 			target->health = 1;
 		}
 		else

src/p_map.cpp

@@ -4679,7 +4679,7 @@ void P_RadiusAttack(AActor *bombspot, AActor *bombsource, int bombdamage, int bo
 
 				if (!(flags & RADF_NODAMAGE))
 					newdam = P_DamageMobj(thing, bombspot, bombsource, damage, bombmod);
-				else if (thing->player == NULL && !(flags & RADF_NOIMPACTDAMAGE))
+				else if (thing->player == NULL && (!(flags & RADF_NOIMPACTDAMAGE) && !(thing->flags7 & MF7_FULLMASS)))
 					thing->flags2 |= MF2_BLASTED;
 
 				if (!(thing->flags & MF_ICECORPSE))
@@ -4691,25 +4691,29 @@ void P_RadiusAttack(AActor *bombspot, AActor *bombsource, int bombdamage, int bo
 					{
 						if (bombsource == NULL || !(bombsource->flags2 & MF2_NODMGTHRUST))
 						{
-							thrust = points * 0.5f / (double)thing->Mass;
+							if (!(thing->flags7 & MF7_FULLMASS))
-							if (bombsource == thing)
 							{
-								thrust *= selfthrustscale;
+							
+								thrust = points * 0.5f / (double)thing->Mass;
+								if (bombsource == thing)
+								{
+									thrust *= selfthrustscale;
+								}
+								velz = (double)(thing->z + (thing->height >> 1) - bombspot->z) * thrust;
+								if (bombsource != thing)
+								{
+									velz *= 0.5f;
+								}
+								else
+								{
+									velz *= 0.8f;
+								}
+								angle_t ang = R_PointToAngle2(bombspot->x, bombspot->y, thing->x, thing->y) >> ANGLETOFINESHIFT;
+								thing->velx += fixed_t(finecosine[ang] * thrust);
+								thing->vely += fixed_t(finesine[ang] * thrust);
+								if (!(flags & RADF_NODAMAGE))
+									thing->velz += (fixed_t)velz;	// this really doesn't work well
 							}
-							velz = (double)(thing->z + (thing->height >> 1) - bombspot->z) * thrust;
-							if (bombsource != thing)
-							{
-								velz *= 0.5f;
-							}
-							else
-							{
-								velz *= 0.8f;
-							}
-							angle_t ang = R_PointToAngle2(bombspot->x, bombspot->y, thing->x, thing->y) >> ANGLETOFINESHIFT;
-							thing->velx += fixed_t(finecosine[ang] * thrust);
-							thing->vely += fixed_t(finesine[ang] * thrust);
-							if (!(flags & RADF_NODAMAGE))
-								thing->velz += (fixed_t)velz;	// this really doesn't work well
 						}
 					}
 				}

src/thingdef/thingdef_data.cpp

@@ -244,6 +244,7 @@ static FFlagDef ActorFlags[]=
 	DEFINE_FLAG(MF7, HARMFRIENDS, AActor, flags7),
 	DEFINE_FLAG(MF7, BUDDHA, AActor, flags7),
 	DEFINE_FLAG(MF7, FOILBUDDHA, AActor, flags7),
+	DEFINE_FLAG(MF7, FULLMASS, AActor, flags7),
 
 	// Effect flags
 	DEFINE_FLAG(FX, VISIBILITYPULSE, AActor, effects),