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.

Sign up for GitHub

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

Radio - Replace inventory PFH with CBA loadout handler #1015

Open
wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Radio - Replace inventory PFH with CBA loadout handler #1015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
13ebd10
Replace monitorRadios PFH with loadout EH
Freddo3000 Aug 17, 2020
c823fe0
Add default radio replacement setting
Freddo3000 Aug 17, 2020
465b878
Tweaks
Freddo3000 Aug 18, 2020
3b9e2fa
localization
Freddo3000 Aug 18, 2020
7f1b494
Obsolete fnc_setItemRadioReplacement
Freddo3000 Aug 18, 2020
d5d0e49
Ensure fnc_getAllRadios is present
Freddo3000 Aug 18, 2020
5f77992
Removed comment
Freddo3000 Aug 22, 2020
8c7ff00
Move fnc_getAllRadios from api to sys_core
Freddo3000 Aug 22, 2020
04b6dc6
Add another trigger for monitorRadiosHandler
Freddo3000 Aug 22, 2020
0c2a072
Merge branch 'master' into tweakItemRadio
Freddo3000 Aug 22, 2020
d330cd0
Update addons/sys_radio/initSettings.sqf
Freddo3000 Dec 14, 2020
bc158ee
Change to use CBA_settings_fnc_set
Freddo3000 Dec 14, 2020
996318b
Tweak basicMissionSetup
Freddo3000 Dec 14, 2020
4b0ef05
Add to ace_arsenal_displayClosed eventhandler
Freddo3000 Dec 14, 2020
c0dc120
Merge branch 'master' into tweakItemRadio
jonpas Jun 14, 2023
dd759a2
Deprecate instead of obsolete setItemRadioReplacement API, Cleanup
jonpas Jun 14, 2023
d6fa737
Merge branch 'master' into tweakItemRadio
jonpas Sep 10, 2023
4dd0dae
Merge branch 'master' into tweakItemRadio
jonpas Sep 27, 2023
d18dd07
Fix merge
jonpas Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/ace_interact/XEH_postInitClient.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ if (!hasInterface) exitWith {};

["ace_arsenal_displayClosed", {
EGVAR(sys_core,arsenalOpen) = false;
[] call DFUNC(monitorRadiosHandler);
Copy link
Member

Choose a reason for hiding this comment

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

Leaving a note here: We have to think about API for this, copy-pasting those lines is far from ideal.

}] call CBA_fnc_addEventHandler;

["ace_arsenal_rightPanelFilled", {
Expand Down
2 changes: 2 additions & 0 deletions addons/sys_core/fnc_arsenalClose.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,5 @@ private _weapons = [acre_player] call EFUNC(sys_core,getGear);
ACRE_ARSENAL_RADIOS = [];
GVAR(arsenalRadios) = [];
GVAR(arsenalOpen) = false;

[] call EFUNC(sys_radio,monitorRadiosHandler);
Freddo3000 marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions addons/sys_gui/fnc_inventoryListMouseUp.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,5 @@ params ["", "_button"];
if (_button == 1) then {
LOG("inventoryListMouseUp");
ACRE_HOLD_OFF_ITEMRADIO_CHECK = false;
[] call EFUNC(sys_radio,monitorRadiosHandler);
};
2 changes: 1 addition & 1 deletion addons/sys_radio/XEH_PREP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PREP(monitorRadios);
PREP(monitorRadiosPFH);
PREP(monitorRadiosHandler);
PREP(setActiveRadio);

PREP(openRadio);
Expand Down
3 changes: 2 additions & 1 deletion addons/sys_radio/fnc_monitorRadios.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Sets up the per frame event handler for monitoring the local player inventory for changes.
* Sets up the CBA loadout event handler for monitoring the local player inventory for changes.
*
* Arguments:
* None
Expand All @@ -27,4 +27,5 @@ LOG("Monitor Inventory Starting");
{time >= 1}
}, {
[DFUNC(monitorRadiosPFH), 0.25, []] call CBA_fnc_addPerFrameHandler;
["loadout", DFUNC(monitorRadiosHandler), true] call CBA_fnc_addPlayerEventHandler;
}, []] call CBA_fnc_waitUntilAndExecute;
2 changes: 1 addition & 1 deletion addons/sys_radio/fnc_monitorRadiosPFH.sqf → ...ns/sys_radio/fnc_monitorRadiosHandler.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* None
*
* Example:
* [] call acre_sys_radio_fnc_monitorRadiosPFH
* [] call acre_sys_radio_fnc_monitorRadiosHandler
*
* Public: No
*/
Expand Down