Zandronum Chat on our Discord Server Get the latest version: 3.2
Source Code
My View | View Issues | Change Log | Roadmap | All Projects Issue Support Ranking | Rules | My Account
  

View Revisions: Issue #2549 [ Back to Issue ]
Summary 0002549: Merge error related to friendly fire in P_DamageMobj
Revision 2015-12-12 23:11 by Dusk
Description ]code]
    // [RH] Avoid friendly fire if enabled
    if (source != NULL &&
        ((player && player != source->player) || (!player && target != source)) &&
        target->IsTeammate (source))
    {
        // [BL] Some adjustments for Skulltag
        if (player && (( teamlms || survival ) && ( MeansOfDeath == NAME_SpawnTelefrag )) == false )
            FriendlyFire = true;
        if (damage < TELEFRAG_DAMAGE)
        { // Still allow telefragging :-(
            damage = (int)((float)damage * level.teamdamage);
            if (damage <= 0)
                return -1;
        }
    }

    // [RH] Avoid friendly fire if enabled
    if (!(flags & DMG_FORCED) && source != NULL &&
        ((player && player != source->player) || (!player && target != source)) &&
        target->IsTeammate (source))
    {
        if (player)
            FriendlyFire = true;
        if (damage < TELEFRAG_DAMAGE)
        { // Still allow telefragging :-(
            damage = (int)((float)damage * level.teamdamage);
            if (damage <= 0)
                return damage;
        }
    }
Revision 2015-12-12 23:11 by Dusk
Description

    // [RH] Avoid friendly fire if enabled
    if (source != NULL &&
        ((player && player != source->player) || (!player && target != source)) &&
        target->IsTeammate (source))
    {
        // [BL] Some adjustments for Skulltag
        if (player && (( teamlms || survival ) && ( MeansOfDeath == NAME_SpawnTelefrag )) == false )
            FriendlyFire = true;
        if (damage < TELEFRAG_DAMAGE)
        { // Still allow telefragging :-(
            damage = (int)((float)damage * level.teamdamage);
            if (damage <= 0)
                return -1;
        }
    }

    // [RH] Avoid friendly fire if enabled
    if (!(flags & DMG_FORCED) && source != NULL &&
        ((player && player != source->player) || (!player && target != source)) &&
        target->IsTeammate (source))
    {
        if (player)
            FriendlyFire = true;
        if (damage < TELEFRAG_DAMAGE)
        { // Still allow telefragging :-(
            damage = (int)((float)damage * level.teamdamage);
            if (damage <= 0)
                return damage;
        }
    }
Revision 2016-01-03 18:35 by cobalt
Description

    // [RH] Avoid friendly fire if enabled
    if (source != NULL &&
        ((player && player != source->player) || (!player && target != source)) &&
        target->IsTeammate (source))
    {
        // [BL] Some adjustments for Skulltag
        if (player && (( teamlms || survival ) && ( MeansOfDeath == NAME_SpawnTelefrag )) == false )
            FriendlyFire = true;
        if (damage < TELEFRAG_DAMAGE)
        { // Still allow telefragging :-(
            damage = (int)((float)damage * level.teamdamage);
            if (damage <= 0)
                return -1;
        }
    }

    // [RH] Avoid friendly fire if enabled
    if (!(flags & DMG_FORCED) && source != NULL &&
        ((player && player != source->player) || (!player && target != source)) &&
        target->IsTeammate (source))
    {
        if (player)
            FriendlyFire = true;
        if (damage < TELEFRAG_DAMAGE)
        { // Still allow telefragging :-(
            damage = (int)((float)damage * level.teamdamage);
            if (damage <= 0)
                return damage;
        }
    }




Questions or other issues? Contact Us.

Links

Copyright © 2000 - 2025 MantisBT Team
Powered by Mantis Bugtracker