Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Frag cleanup #874

Merged
merged 9 commits into from
Apr 30, 2015
Merged

Frag cleanup #874

merged 9 commits into from
Apr 30, 2015

Conversation

ulteq
Copy link
Contributor

@ulteq ulteq commented Apr 26, 2015

Fixes: #824

Review needed.

ulteq added 2 commits April 26, 2015 23:05
*Moved GVAR(enabled) into ACE_Settings.hpp
*Replaced BIS_fnc_magnitude with vectorMagnitude
*Renamed Nou_GBU12
*Added G_40mm_HE config data
@ulteq ulteq added the kind/cleanup Release Notes: **CHANGED:** label Apr 26, 2015
@ulteq ulteq added this to the 3.0.0 milestone Apr 26, 2015
@ulteq
Copy link
Contributor Author

ulteq commented Apr 26, 2015

We should also disable the firedEH if the projectile does not inherit from GrenadeBase.

@NouberNou
Copy link
Contributor

Why would we disable the firedEH for that? Tons of other things that cause frag inherit from stuff other than GrenadeBase....

#include "script_component.hpp"
private ["_round"];
_round = _this select 0;
GVAR(blackList) set[(count GVAR(blackList)), _round];
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are we removing the blacklist? This function might actually be useful to keep around. Though we do need to adjust it to a pushback.

@ulteq
Copy link
Contributor Author

ulteq commented Apr 27, 2015

Tons of other things that cause frag inherit from stuff other than GrenadeBase....

Makes sense.

Are we removing the blacklist?

No, the blacklist is still in place, but the addBlackList function was never called, so I removed it for now.

@thojkooi
Copy link
Contributor

But we could use it for access by third parties. That way we do not have to expose the variable, but only the function. ref: #820

@ulteq
Copy link
Contributor Author

ulteq commented Apr 27, 2015

Agreed: 3c92cab

ulteq added 4 commits April 27, 2015 13:58
* Added missing privates
* Removed unused privates
* Replaced some old vector calculations with new vector commands
@ulteq
Copy link
Contributor Author

ulteq commented Apr 28, 2015

@NouberNou, can we merge it?

@jaynus
Copy link
Contributor

jaynus commented Apr 28, 2015

Lets do #342 in this branch too first, and then merge.

@ulteq
Copy link
Contributor Author

ulteq commented Apr 28, 2015

Ok

@gienkov
Copy link
Contributor

gienkov commented Apr 28, 2015

By just simply looking I assume GBU12 will spawn loads of shrapnels? Will it impact framerate?

@jaynus
Copy link
Contributor

jaynus commented Apr 28, 2015

Well you shouldn't be dropping 50 GBU's all at the same time, so no :p

@ulteq
Copy link
Contributor Author

ulteq commented Apr 29, 2015

Lets do #342 in this branch too first, and then merge.

Those are done:

  • G_40mm_HE
  • G_40mm_HEDP
  • Sh_82mm_AMOS
  • Sh_155mm_AMOS

@ulteq
Copy link
Contributor Author

ulteq commented Apr 29, 2015

I will merge this tomorrow, if there are no objections.

ulteq added a commit that referenced this pull request Apr 30, 2015
@ulteq ulteq merged commit d2aa287 into master Apr 30, 2015
@ulteq ulteq deleted the fragCleanup branch April 30, 2015 08:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/cleanup Release Notes: **CHANGED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Clean up ace_frag
5 participants