Skip to content

Add two small countermeasure features#423

Merged
Goober5000 merged 3 commits into
scp-fs2open:masterfrom
niffiwan:feature/customise_cm_det_rad
Nov 15, 2015
Merged

Add two small countermeasure features#423
Goober5000 merged 3 commits into
scp-fs2open:masterfrom
niffiwan:feature/customise_cm_det_rad

Conversation

@niffiwan

@niffiwan niffiwan commented Nov 8, 2015

Copy link
Copy Markdown
Member

I've combined the commits into a single PR because they're changing the same areas of the code and will be simpler to merge together.

Trivial efficiency improvement by calculating a pointer once & reusing
it. Add more countermeasure nprintf messages

Add to weapons tbl/tbm
$Countermeasure:
    +Missile Detonation Radius: 40
As opposed to detonating all missiles within a radius. Is more
efficient than previous code that traversed the entire missile object
list to find all the missiles to detonate

Add to weapons tbl/tbm
$Countermeasure:
    +Single Missile Kill:   False
@niffiwan niffiwan added the enhancement A new feature or upgrade of an existing feature to add additional functionality. label Nov 8, 2015
@Goober5000

Copy link
Copy Markdown
Contributor

So this obsoletes #415 then?

I'd like a few days to look at this (and also #358). I have some design questions but I'm traveling at the moment and I want to get back and look at the code first.

@MageKing17

Copy link
Copy Markdown
Member

This is completely separate from #415.

@Goober5000

Copy link
Copy Markdown
Contributor

Thanks for holding off for a few days. My design concerns mainly relate to #415. This one LGTM.

Goober5000 added a commit that referenced this pull request Nov 15, 2015
@Goober5000 Goober5000 merged commit 8177c03 into scp-fs2open:master Nov 15, 2015
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement A new feature or upgrade of an existing feature to add additional functionality.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants