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

Got rid of the __DSP macro

Browse Source
This commit is contained in:
ulteq 2015-04-16 19:52:20 +02:00
parent c79afeb2fe
commit 1794606304
10 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/atragmx/functions/fnc_create_dialog.sqf
View File

@ -29,7 +29,7 @@ GVAR(showAddNewGun) call FUNC(show_add_new_gun);
GVAR(showGunList) call FUNC(show_gun_list);
GVAR(showRangeCard) call FUNC(show_range_card);
if (GVAR(showRangeCard)) then {
ctrlSetFocus (__DSP displayCtrl 5001);
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 5001);
[] call FUNC(update_range_card);
};
GVAR(showRangeCardSetup) call FUNC(show_range_card_setup);

2
addons/atragmx/functions/fnc_show_gun_list.sqf
View File

@ -20,7 +20,7 @@ GVAR(showGunList) = _this;
{ctrlShow [_x, _this]} forEach [6000, 6001, 6002, 6003, 6004, 6005, 6006, 6007];
if (_this) then {
ctrlSetFocus (__DSP displayCtrl 6002);
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 6002);
lbSetCurSel [6000, GVAR(currentGun)];
};

2
addons/atragmx/functions/fnc_show_range_card_setup.sqf
View File

@ -20,7 +20,7 @@ GVAR(showRangeCardSetup) = _this;
{ctrlShow [_x, _this]} forEach [10000, 10001, 10002, 10003, 10004, 10005, 10006, 10007, 10008, 10009];
if (_this) then {
ctrlSetFocus (__DSP displayCtrl 10006);
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 10006);
ctrlSetText [10003, Str(Round(GVAR(rangeCardStartRange)))];
ctrlSetText [10004, Str(Round(GVAR(rangeCardEndRange)))];

2
addons/atragmx/functions/fnc_show_target_range_assist.sqf
View File

@ -20,7 +20,7 @@ GVAR(showTargetRangeAssist) = _this;
{ctrlShow [_x, _this]} forEach [7000, 7001, 7002, 7003, 7004, 7005, 7006, 7007, 7008, 7009, 7010, 7011, 7012, 7013, 7014, 7015, 7016, 7017, 7018, 7019, 7020];
if (_this) then {
ctrlSetFocus (__DSP displayCtrl 7018);
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 7018);
ctrlSetText [7012, Str(parseNumber(ctrlText 320))];
ctrlSetText [7013, Str(parseNumber(ctrlText 340))];

2
addons/atragmx/functions/fnc_show_target_speed_assist.sqf
View File

@ -20,7 +20,7 @@ GVAR(showTargetSpeedAssist) = _this;
{ctrlShow [_x, _this]} forEach [8000, 8001, 8002, 8003, 8004, 8005, 8006, 8007, 8008, 8009, 8010, 8011, 8012, 8013, 8014, 8015];
if (_this) then {
ctrlSetFocus (__DSP displayCtrl 8012);
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 8012);
ctrlSetText [8004, Str(Round((GVAR(targetRange) select GVAR(currentTarget))))];

2
addons/atragmx/functions/fnc_target_speed_assist_timer.sqf
View File

@ -20,7 +20,7 @@ if !(ctrlVisible 9000) then {
false call FUNC(show_target_speed_assist);
true call FUNC(show_target_speed_assist_timer);
ctrlSetFocus (__DSP displayCtrl 9002);
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 9002);
[{
private ["_args", "_startTime"];

2
addons/atragmx/functions/fnc_toggle_range_card.sqf
View File

@ -24,7 +24,7 @@ if (ctrlVisible 5006) then
false call FUNC(show_main_page);
true call FUNC(show_range_card);
ctrlSetFocus (__DSP displayCtrl 5001);
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 5001);
[] call FUNC(calculate_range_card);
[] call FUNC(update_range_card);

12
addons/atragmx/functions/fnc_update_target_selection.sqf
View File

@ -15,13 +15,13 @@
*/
#include "script_component.hpp"
(__DSP displayCtrl 500) ctrlEnable true;
(__DSP displayCtrl 501) ctrlEnable true;
(__DSP displayCtrl 502) ctrlEnable true;
(__DSP displayCtrl 503) ctrlEnable true;
((uiNamespace getVariable "ATragMX_Display") displayCtrl 500) ctrlEnable true;
((uiNamespace getVariable "ATragMX_Display") displayCtrl 501) ctrlEnable true;
((uiNamespace getVariable "ATragMX_Display") displayCtrl 502) ctrlEnable true;
((uiNamespace getVariable "ATragMX_Display") displayCtrl 503) ctrlEnable true;
(__DSP displayCtrl 500 + GVAR(currentTarget)) ctrlEnable false;
((uiNamespace getVariable "ATragMX_Display") displayCtrl 500 + GVAR(currentTarget)) ctrlEnable false;
ctrlSetFocus (__DSP displayCtrl 3000);
ctrlSetFocus ((uiNamespace getVariable "ATragMX_Display") displayCtrl 3000);
[] call FUNC(update_unit_selection);

8
addons/atragmx/functions/fnc_update_unit_selection.sqf
View File

@ -15,11 +15,11 @@
*/
#include "script_component.hpp"
(__DSP displayCtrl 600) ctrlEnable true;
(__DSP displayCtrl 601) ctrlEnable true;
(__DSP displayCtrl 602) ctrlEnable true;
((uiNamespace getVariable "ATragMX_Display") displayCtrl 600) ctrlEnable true;
((uiNamespace getVariable "ATragMX_Display") displayCtrl 601) ctrlEnable true;
((uiNamespace getVariable "ATragMX_Display") displayCtrl 602) ctrlEnable true;
(__DSP displayCtrl 600 + GVAR(currentUnit)) ctrlEnable false;
((uiNamespace getVariable "ATragMX_Display") displayCtrl 600 + GVAR(currentUnit)) ctrlEnable false;
[] call FUNC(update_gun);
[] call FUNC(update_atmosphere);

2
addons/atragmx/script_component.hpp
View File

@ -10,5 +10,3 @@
#endif
#include "\z\ace\addons\main\script_macros.hpp"
#define __DSP (uiNamespace getVariable "ATragMX_Display")