Move Warheads from the engine to Mods.Common #8635
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -40,7 +41,8 @@ public void Killed(Actor self, AttackInfo e) | |||
| if (self.World.SharedRandom.Next(100) > info.Chance) | |||
| return; | |||
|
|
|||
| if (info.DeathType != null && e.Warhead != null && !info.DeathType.Intersect(e.Warhead.DamageTypes).Any()) | |||
| var warhead = e.Warhead as DamageWarhead; | |||
| if (info.DeathType != null && e.Warhead != null && !info.DeathType.Intersect(warhead.DamageTypes).Any()) | |||
There was a problem hiding this comment.
This (and the other code like it) need to be checking warhead != null to avoid a NRE if e.Warhead isn't a DamageWarhead.
There was a problem hiding this comment.
This is the warhead that killed the actor, so how can it not have dealt damage?
There was a problem hiding this comment.
"this won't happen in practice" is no excuse for incorrect code :)
|
Everything still shoots, gets damaged, spawns visceroids and deteriorate without concrete. ✅ |
|
Needs a rebase. |
|
Rebased. |
|
Code looks good to me and warheads still work (including special cases like spawning visceroid and changing owner). |
reaperrr
added a commit
that referenced
this pull request
Jul 7, 2015
Move Warheads from the engine to Mods.Common
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Introduces
IWarheadto enable movingWarheadandDamageWarheadoutside of the engine and intoOpenRA.Mods.Common.Warheads, where they belong.Split into several commits to make reviewing easier.
This is the last step before
Armorcan be moved toMods.Commonand made upgradable.