-
Notifications
You must be signed in to change notification settings - Fork 50
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Area Markers - Only allow editing when in markers mode (#765)
- Loading branch information
Showing
21 changed files
with
129 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
#include "script_component.hpp" | ||
/* | ||
* Author: mharis001 | ||
* Checks if the Zeus display is in marker editing mode. | ||
* | ||
* Arguments: | ||
* None | ||
* | ||
* Return Value: | ||
* In Marker Editing Mode <BOOL> | ||
* | ||
* Example: | ||
* [] call zen_area_markers_fnc_isInEditMode | ||
* | ||
* Public: No | ||
*/ | ||
|
||
visibleMap | ||
&& {!dialog} | ||
&& {!call EFUNC(common,isInScreenshotMode)} | ||
&& {RscDisplayCurator_sections select 0 == CURATOR_MODE_MARKERS} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#include "script_component.hpp" | ||
/* | ||
* Author: mharis001 | ||
* Handles unloading the Zeus Display. | ||
* | ||
* Arguments: | ||
* 0: Display (not used) <DISPLAY> | ||
* | ||
* Return Value: | ||
* None | ||
* | ||
* Example: | ||
* [DISPLAY] call zen_area_markers_fnc_onUnload | ||
* | ||
* Public: No | ||
*/ | ||
|
||
GVAR(visibilityPFH) call CBA_fnc_removePerFrameHandler; | ||
GVAR(visibilityPFH) = nil; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
#include "script_component.hpp" | ||
/* | ||
* Author: mharis001 | ||
* Handles updating the visibility of area marker icons. | ||
* | ||
* Arguments: | ||
* 0: Arguments <ARRAY> | ||
* 0: Current Visibility <BOOL> | ||
* | ||
* Return Value: | ||
* None | ||
* | ||
* Example: | ||
* [[false]] call zen_area_markers_fnc_onVisibilityPFH | ||
* | ||
* Public: No | ||
*/ | ||
|
||
BEGIN_COUNTER(onVisibilityPFH); | ||
|
||
params ["_args"]; | ||
_args params ["_oldVisibility"]; | ||
|
||
private _newVisibility = call FUNC(isInEditMode); | ||
|
||
if (_oldVisibility isNotEqualTo _newVisibility) then { | ||
{ | ||
_y ctrlShow _newVisibility; | ||
} forEach GVAR(icons); | ||
|
||
_args set [0, _newVisibility]; | ||
}; | ||
|
||
END_COUNTER(onVisibilityPFH); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
// Create Tree Tabs (Modes and Sides) | ||
#define CURATOR_MODE_UNITS 0 | ||
#define CURATOR_MODE_GROUPS 1 | ||
#define CURATOR_MODE_MODULES 2 | ||
#define CURATOR_MODE_MARKERS 3 | ||
#define CURATOR_MODE_RECENT 4 | ||
|
||
#define CURATOR_SIDE_BLUFOR 0 | ||
#define CURATOR_SIDE_OPFOR 1 | ||
#define CURATOR_SIDE_INDEPENDENT 2 | ||
#define CURATOR_SIDE_CIVILIAN 3 | ||
#define CURATOR_SIDE_EMPTY 4 | ||
|
||
// Selected Entities | ||
#define SELECTED_OBJECTS (curatorSelected select 0) | ||
#define SELECTED_GROUPS (curatorSelected select 1) | ||
#define SELECTED_WAYPOINTS (curatorSelected select 2) | ||
#define SELECTED_MARKERS (curatorSelected select 3) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters