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

Open radio on base action point in addition to sub-action #326

Merged
merged 2 commits into from Apr 30, 2017

Conversation

jonpas
Copy link
Member

@jonpas jonpas commented Apr 29, 2017

When merged this pull request will:

Opening radio on base action should be done for racks as well, there is currently no way apart from keybind (which is broken from where this was branched off). I will leave that to @TheMagnetar as he knows the code.

I think there is no need for an "Open" text either, should be pretty self-explanatory that the radio icon opens the radio. Changed to action on both nodes.

@jonpas jonpas added this to the 2.5.0 milestone Apr 29, 2017
Copy link
Member

@TheMagnetar TheMagnetar left a comment

Choose a reason for hiding this comment

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

I changed some lines since the EFUNC(sys_radio,openRadio) already handles if a radio can or cannot be opened. It is not that you want to hide the action like it was in fnc_radioChildrenActions.sqf

},
{
(_this select 2) params ["_radio"];
!((_radio in ACRE_ACCESSIBLE_RACK_RADIOS && {isTurnedOut acre_player}) || (toLower _radio) in ACRE_HEARABLE_RACK_RADIOS)
Copy link
Member

Choose a reason for hiding this comment

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

This is not necessary since openRadio handles all these cases already. It even shows a hint :)

@jonpas jonpas changed the title Open radio on base action point instead of sub-action Open radio on base action point in addition to sub-action Apr 30, 2017
@jonpas jonpas merged commit b9efc92 into master Apr 30, 2017
@jonpas jonpas deleted the openRadioBaseAction branch April 30, 2017 18:30
@jonpas jonpas removed the discussion label Apr 30, 2017
jonpas added a commit that referenced this pull request Sep 7, 2017
Open radio on base action point in addition to sub-action
jonpas added a commit that referenced this pull request Sep 7, 2017
Open radio on base action point in addition to sub-action
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants