Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Yardage - Make macros uppercase (#9894)

Browse Source 
* Renamed macros in yardage

* Update fnc_turnOn.sqf
This commit is contained in:
johnb432 2024-04-02 15:26:42 +02:00 committed by GitHub
parent 8805414669
commit 35d40e614c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
addons/yardage450/functions/fnc_turnOn.sqf
View File

@ -15,12 +15,12 @@
* Public: No * Public: No
*/ */
#define __dsp (uiNamespace getVariable "ACE_RscYardage450") #define DISPLAY_YARDAGE (uiNamespace getVariable "ACE_RscYardage450")
#define __ctrlTarget (__dsp displayCtrl 720041) #define CTRL_TARGET (DISPLAY_YARDAGE displayCtrl 720041)
#define __ctrlLaser (__dsp displayCtrl 720042) #define CTRL_LASER (DISPLAY_YARDAGE displayCtrl 720042)
#define __ctrlRange (__dsp displayCtrl 720043) #define CTRL_RANGE (DISPLAY_YARDAGE displayCtrl 720043)
#define __ctrlMeters (__dsp displayCtrl 720044) #define CTRL_METERS (DISPLAY_YARDAGE displayCtrl 720044)
#define __ctrlYards (__dsp displayCtrl 720045) #define CTRL_YARDS (DISPLAY_YARDAGE displayCtrl 720045)
if (currentWeapon ACE_player != "ACE_Yardage450" || cameraView != "GUNNER") exitWith {}; if (currentWeapon ACE_player != "ACE_Yardage450" || cameraView != "GUNNER") exitWith {};
@ -38,21 +38,21 @@ GVAR(active) = true;
}; };
if (currentWeapon ACE_player == "ACE_Yardage450" && cameraView == "GUNNER") then { if (currentWeapon ACE_player == "ACE_Yardage450" && cameraView == "GUNNER") then {
if (isNil {__dsp} || {isNull __dsp} || {ctrlIDD __dsp != -1}) then { if (isNil {DISPLAY_YARDAGE} || {isNull DISPLAY_YARDAGE} || {ctrlIDD DISPLAY_YARDAGE != -1}) then {
TRACE_1("making display",__dsp); TRACE_1("making display",DISPLAY_YARDAGE);
QUOTE(ADDON) cutRsc ["ACE_RscYardage450", "PLAIN", 1, false]; QUOTE(ADDON) cutRsc ["ACE_RscYardage450", "PLAIN", 1, false];
}; };
__ctrlLaser ctrlShow GVAR(lasing); CTRL_LASER ctrlShow GVAR(lasing);
if (GVAR(targetAcquired)) then { if (GVAR(targetAcquired)) then {
__ctrlTarget ctrlSetText "Target Acquired"; CTRL_TARGET ctrlSetText "Target Acquired";
__ctrlRange ctrlSetText GVAR(targetRangeText); CTRL_RANGE ctrlSetText GVAR(targetRangeText);
} else { } else {
__ctrlTarget ctrlSetText ""; CTRL_TARGET ctrlSetText "";
__ctrlRange ctrlSetText "---"; CTRL_RANGE ctrlSetText "---";
}; };
__ctrlMeters ctrlShow !GVAR(useYards); CTRL_METERS ctrlShow !GVAR(useYards);
__ctrlYards ctrlShow GVAR(useYards); CTRL_YARDS ctrlShow GVAR(useYards);
} else { } else {
QUOTE(ADDON) cutText ["", "PLAIN"]; QUOTE(ADDON) cutText ["", "PLAIN"];
}; };