epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8635 from penev92/bleed_warheads

Browse Source 
Move Warheads from the engine to Mods.Common
This commit is contained in:
reaperrr
2015-07-07 18:32:45 +02:00
parent 08c6f02b9e c3fcd9a8a1
commit bbf9596530
24 changed files with 80 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenRA.Mods.D2k/Warheads/ChangeOwnerWarhead.cs
View File

@@ -9,7 +9,7 @@
#endregion
using System.Collections.Generic;
using OpenRA.GameRules;
using OpenRA.Mods.Common.Warheads;
using OpenRA.Mods.D2k.Traits;
using OpenRA.Traits;
@@ -30,11 +30,12 @@ namespace OpenRA.Mods.D2k.Warheads
foreach (var a in actors)
{
if (a.Owner == firedBy.Owner) // don't do anything on friendly fire
// Don't do anything on friendly fire
if (a.Owner == firedBy.Owner)
continue;
if (Duration == 0)
a.ChangeOwner(firedBy.Owner); // permanent
a.ChangeOwner(firedBy.Owner); // Permanent
else
{
var tempOwnerManager = a.TraitOrDefault<TemporaryOwnerManager>();
@@ -44,7 +45,8 @@ namespace OpenRA.Mods.D2k.Warheads
tempOwnerManager.ChangeOwner(a, firedBy.Owner, Duration);
}
a.CancelActivity(); // stop shooting, you have got new enemies
// Stop shooting, you have new enemies
a.CancelActivity();
}
}
}