Skip to content

Set negative draw priority for Building Markers #733

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

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

Set negative draw priority for Building Markers #733

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d1caacb
building-marker-priority
ampersand38 Apr 23, 2023
4ec5f8e
JIP
ampersand38 Apr 25, 2023
885e50e
remove from JIP on delete
ampersand38 May 20, 2023
c1a6c60
remove jip on marker delete
ampersand38 May 21, 2023
9547328
Merge remote-tracking branch 'upstream/master' into building-marker-p…
ampersand38 Oct 12, 2023
2297b56
don't use _object for CBA_fnc_removeGlobalEventJIP
ampersand38 Oct 12, 2023
3ea5c51
handle the marker deletion while object persists
ampersand38 Oct 12, 2023
1f379c1
FUNC
ampersand38 Oct 12, 2023
6d7e35c
variable not needed
ampersand38 Oct 12, 2023
1d0e8bb
Merge branch 'building-marker-priority' of https://github.com/ampersa…
ampersand38 Oct 12, 2023
cf0644e
use netId to get building from marker
ampersand38 Oct 12, 2023
fe71ba1
Update addons/building_markers/XEH_postInit.sqf
ampersand38 Oct 12, 2023
7b4df37
Update addons/building_markers/XEH_postInit.sqf
ampersand38 Oct 13, 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
3 changes: 3 additions & 0 deletions addons/building_markers/functions/fnc_set.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ if (_set) then {
_marker setMarkerDir getDir _object;
_object setVariable [QGVAR(marker), _marker, true];

private _jipID = [QEGVAR(common,setMarkerDrawPriority), [_marker, -1], _marker] call CBA_fnc_globalEventJIP;
[_jipID, _object] call CBA_fnc_removeGlobalEventJIP;

@mharis001 mharis001 May 21, 2023

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Does not handle the marker being removed without the object being deleted.


// Delete marker when the object is deleted
private _eventID = _object addEventHandler ["Deleted", {
params ["_object"];
Expand Down
5 changes: 5 additions & 0 deletions addons/common/XEH_postInit.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,11 @@
_object setObjectScale _scale;
}] call CBA_fnc_addEventHandler;

[QGVAR(setMarkerDrawPriority), {
params ["_markerName", "_priority"];
_markerName setMarkerDrawPriority _priority;
}] call CBA_fnc_addEventHandler;

[QGVAR(setVehicleRadar), {
params ["_vehicle", "_mode"];
_vehicle setVehicleRadar _mode;
Expand Down