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

View Issue Details [ Jump to Notes ] [ Issue History ] [ Print ]
IDProjectCategoryView StatusDate SubmittedLast Update
0002549Zandronum[All Projects] Bugpublic2015-12-12 23:112018-09-30 21:49
ReporterDusk 
Assigned ToDusk 
PrioritynormalSeverityminorReproducibilityhave not tried
StatusclosedResolutionfixed 
PlatformOSOS Version
Product Version3.0-beta 
Target Version3.0Fixed in Version3.0 
Summary0002549: Merge error related to friendly fire in P_DamageMobj
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;
        }
    }
Attached Files

- Relationships
child of 0002172closedTorr Samaho Upgrade GZDoom base to 1.8.6 

-  Notes
User avatar (0014001)
Dusk (developer)
2015-12-20 18:07

 'https://bitbucket.org/Torr_Samaho/zandronum/pull-requests/46 [^]'
User avatar (0014041)
cobalt (updater)
2016-01-03 18:35

 Issue addressed by commit fa7878558aa5: Fixed merge error in P_DamageMobj (fixes 2549)
Committed by Teemu Piippo [Dusk] on Sunday 20 December 2015 20:04:53

Changes in files:

 src/p_interaction.cpp | 17 +----------------
 1 files changed, 1 insertions(+), 16 deletions(-)

Issue Community Support
This issue is already marked as resolved.
If you feel that is not the case, please reopen it and explain why.
Supporters: No one explicitly supports this issue yet.
Opponents: No one explicitly opposes this issue yet.

- Issue History
Date Modified Username Field Change
2015-12-12 23:11 Dusk New Issue
2015-12-12 23:11 Dusk Summary Merge error in P_DamageMobj => Merge error related to friendly fire in P_DamageMobj
2015-12-12 23:11 Dusk Description Updated View Revisions
2015-12-20 17:59 Dusk Assigned To => Dusk
2015-12-20 17:59 Dusk Status new => assigned
2015-12-20 18:00 Dusk Relationship added parent of 0002172
2015-12-20 18:00 Dusk Relationship replaced child of 0002172
2015-12-20 18:07 Dusk Note Added: 0014001
2015-12-20 18:07 Dusk Status assigned => needs review
2016-01-03 18:35 cobalt Status needs review => needs testing
2016-01-03 18:35 cobalt Target Version => 3.0
2016-01-03 18:35 cobalt Description Updated View Revisions
2016-01-03 18:35 cobalt Note Added: 0014041
2017-02-06 19:19 Dusk Status needs testing => resolved
2017-02-06 19:19 Dusk Fixed in Version => 3.0
2017-02-06 19:19 Dusk Resolution open => fixed
2018-09-30 21:49 Blzut3 Status resolved => closed




Questions or other issues? Contact Us.

Links

Copyright © 2000 - 2025 MantisBT Team
Powered by Mantis Bugtracker