Welcome to the ZDoom Forums!

Major Cooke wrote:Fishy, these have been in for several weeks if not a month or two now. The MOMENT they are added, at that very nanosecond, they're in for good, until the foreseeable future when this rule changes or when Graf/Randy say.

Graf Zahl wrote:That said, I think that some cleanup will be in order after this gets added. There's too many reflection-specific things spread out through the main flags now, they better get consolidated into their own ReflectionFlags field, just like it was done for bouncing flags.

Gez wrote:Having just one A_Damage function wouldn't really reduce actual code bloat.

Spoiler:

---

Code: Select all

DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_Damage)
{
	ACTION_PARAM_START(4);
	ACTION_PARAM_INT(ptr_victim, 0);
	ACTION_PARAM_INT(amount, 1);
	ACTION_PARAM_NAME(DamageType, 2);
	ACTION_PARAM_INT(flags, 3);

	AActor *victim;
	COPY_AAPTR_NOT_NULL(self, victim, ptr_victim);
	DoDamage(victim, self, amount, DamageType, flags);
}

Nightfall wrote:Technically that is untrue because these functions haven't been included in an actual ZDoom release.

FishyClockwork wrote:To give examples:

It is more important that:
Functions such as A_DamageTarget, A_DamageTracer, A_DamageSelf are reasonable stable and bug free.
(to be clear, I'm not saying they should be removed since, at this point, it's far too late.)

Rather than:
Seriously considering if the aforementioned functions are in fact redundant/code-bloat and are therefore unnecessary since a generic A_Damage function would be a much better candidate. After all, maintaining one is easier than maintaining three.
(A_DamageMaster in an exception because it's been around for a long time and must be maintained for backwards compatibility.)

I'm just trying (and apparently failing) to understand the policy about what sort of suggested features and/or code submissions are acceptable to implement.

FishyClockwork wrote:(to be clear, I'm not saying they should be removed since, at this point, it's far too late.)

Spoiler:

---

Code: Select all

//===========================================================================
//
// Common A_Damage handler
//
// A_Damage* (int amount, str damagetype, int flags)
// Damages the specified actor by the specified amount. Negative values heal.
//
//===========================================================================

enum DMSS
{
	DMSS_FOILINVUL			= 1,
	DMSS_AFFECTARMOR		= 2,
	DMSS_KILL				= 4,
	DMSS_NOFACTOR			= 8,
	DMSS_FOILBUDDHA			= 16,
	DMSS_NOPROTECT			= 32,
};

static void DoDamage(AActor *dmgtarget, AActor *self, int amount, FName DamageType, int flags)
{
	int dmgFlags = 0;
	if (flags & DMSS_FOILINVUL)
		dmgFlags += DMG_FOILINVUL;
	if (flags & DMSS_FOILBUDDHA)
		dmgFlags += DMG_FOILBUDDHA;
	if ((flags & DMSS_KILL) || (flags & DMSS_NOFACTOR)) //Kill implies NoFactor
		dmgFlags += DMG_NO_FACTOR;
	if (!(flags & DMSS_AFFECTARMOR) || (flags & DMSS_KILL)) //Kill overrides AffectArmor
		dmgFlags += DMG_NO_ARMOR;
	if (flags & DMSS_KILL) //Kill adds the value of the damage done to it. Allows for more controlled extreme death types.
		amount += dmgtarget->health;
	if (flags & DMSS_NOPROTECT) //Ignore PowerProtection.
		dmgFlags += DMG_NO_PROTECT;

	if (amount > 0)
		P_DamageMobj(dmgtarget, self, self, amount, DamageType, dmgFlags); //Should wind up passing them through just fine.

	else if (amount < 0)
	{
		amount = -amount;
		P_GiveBody(dmgtarget, amount);
	}
}

//===========================================================================
//
//
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_DamageSelf)
{
	ACTION_PARAM_START(3);
	ACTION_PARAM_INT(amount, 0);
	ACTION_PARAM_NAME(DamageType, 1);
	ACTION_PARAM_INT(flags, 2);

	DoDamage(self, self, amount, DamageType, flags);
}

//===========================================================================
//
//
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_DamageTarget)
{
	ACTION_PARAM_START(3);
	ACTION_PARAM_INT(amount, 0);
	ACTION_PARAM_NAME(DamageType, 1);
	ACTION_PARAM_INT(flags, 2);

	if (self->target != NULL) DoDamage(self->target, self, amount, DamageType, flags);
}

//===========================================================================
//
//
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_DamageTracer)
{
	ACTION_PARAM_START(3);
	ACTION_PARAM_INT(amount, 0);
	ACTION_PARAM_NAME(DamageType, 1);
	ACTION_PARAM_INT(flags, 2);

	if (self->tracer != NULL) DoDamage(self->tracer, self, amount, DamageType, flags);
}

//===========================================================================
//
//
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_DamageMaster)
{
	ACTION_PARAM_START(3);
	ACTION_PARAM_INT(amount, 0);
	ACTION_PARAM_NAME(DamageType, 1);
	ACTION_PARAM_INT(flags, 2);

	if (self->master != NULL) DoDamage(self->master, self, amount, DamageType, flags);
}

//===========================================================================
//
//
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_DamageChildren)
{
	ACTION_PARAM_START(3);
	ACTION_PARAM_INT(amount, 0);
	ACTION_PARAM_NAME(DamageType, 1);
	ACTION_PARAM_INT(flags, 2);

	TThinkerIterator<AActor> it;
	AActor * mo;

	while ( (mo = it.Next()) )
	{
		if (mo->master == self) DoDamage(mo, self, amount, DamageType, flags);
	}
}

//===========================================================================
//
//
//
//===========================================================================
DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_DamageSiblings)
{
	ACTION_PARAM_START(3);
	ACTION_PARAM_INT(amount, 0);
	ACTION_PARAM_NAME(DamageType, 1);
	ACTION_PARAM_INT(flags, 2);

	TThinkerIterator<AActor> it;
	AActor * mo;

	if (self->master != NULL)
	{
		while ((mo = it.Next()))
		{
			if (mo->master == self->master && mo != self) DoDamage(mo, self, amount, DamageType, flags);
		}
	}
}

Graf Zahl wrote:What's amusing?

Spoiler: code

---

p_map.cpp, PIT_CheckThing:

Code: Select all

        if ((thing->flags7 & MF7_THRUREFLECT) && (tm.thing->flags & MF_MISSILE))
        {
            if (tm.thing->flags2 & MF2_SEEKERMISSILE)
            {
                tm.thing->tracer = tm.thing->target;
            }
            tm.thing->target = thing;
            return true;
        }

...and P_BounceActor:

Code: Select all

    if (BlockingMobj && (BlockingMobj->flags7 & MF7_THRUREFLECT)) return true;

...and P_PushUp:

Code: Select all

        if ((thing->flags & MF_MISSILE) && (intersect->flags7 & MF7_THRUREFLECT))
            continue;

Gez wrote:Writing the code goes a long way towards making unneeded, niche-specific suggestions get accepted after all.

FishyClockwork wrote:I'm not complaining, just a little amused that some things the devs rejected for various reasons such as "Not Needed, Too specific/niche, supports modder laziness" etc, you've managed to implement without much objection.