MantisBT - Zandronum |
| View Issue Details |
|
| ID | Project | Category | View Status | Date Submitted | Last Update |
| 0002549 | Zandronum | [All Projects] Bug | public | 2015-12-12 23:11 | 2018-09-30 21:49 |
|
| Reporter | Dusk | |
| Assigned To | Dusk | |
| Priority | normal | Severity | minor | Reproducibility | have not tried |
| Status | closed | Resolution | fixed | |
| Platform | | OS | | OS Version | |
| Product Version | 3.0-beta | |
| Target Version | 3.0 | Fixed in Version | 3.0 | |
|
| Summary | 0002549: 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;
}
}
|
| Steps To Reproduce | |
| Additional Information | |
| Tags | No tags attached. |
| Relationships | | child of | 0002172 | closed | Torr Samaho | Upgrade GZDoom base to 1.8.6 |
|
| Attached Files | |
|
| 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 | bug_revision_view_page.php?rev_id=8314#r8314 |
| 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 | bug_revision_view_page.php?rev_id=8390#r8390 |
| 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 |