Replaced all execVM occurrences

This commit is contained in:
ulteq 2015-04-06 21:41:07 +02:00
parent cab8603db6
commit 91be37c6f3
8 changed files with 34 additions and 36 deletions

View File

@ -1042,7 +1042,7 @@ class ATragMX_Display
idc=8010; idc=8010;
y=0.265*safezoneH+safezoneY+0.5; y=0.265*safezoneH+safezoneY+0.5;
text="Start"; text="Start";
action="execVM '\atragmx\fnc_target_speed_assist_timer.sqf'"; action="call '\atragmx\fnc_target_speed_assist_timer.sqf'";
}; };
class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT class TEXT_TARGET_SPEED_ASSIST_TARGET_ESTIMATED_SPEED_UNIT: TEXT_TARGET_RANGE_ASSIST_ESTIMATED_RANGE_UNIT
{ {

View File

@ -1,24 +1,22 @@
#include "script_component.hpp" #include "script_component.hpp"
systemChat "create_dialog";
if (dialog) exitWith { false }; if (dialog) exitWith { false };
if (underwater ACE_player) exitWith { false }; if (underwater ACE_player) exitWith { false };
if (!("ACE_ATragMX" in (uniformItems ACE_player)) && !("ACE_ATragMX" in (vestItems ACE_player))) exitWith { false }; if (!("ACE_ATragMX" in (uniformItems ACE_player)) && !("ACE_ATragMX" in (vestItems ACE_player))) exitWith { false };
execVM "\atragmx\fnc_update_target_selection.sqf"; call FUNC(update_target_selection);
createDialog 'ATragMX_Display'; createDialog 'ATragMX_Display';
true execVM "\atragmx\fnc_show_main_page.sqf"; true call FUNC(show_main_page);
false execVM "\atragmx\fnc_show_add_new_gun.sqf"; false call FUNC(show_add_new_gun);
false execVM "\atragmx\fnc_show_gun_list.sqf"; false call FUNC(show_gun_list);
false execVM "\atragmx\fnc_show_range_card.sqf"; false call FUNC(show_range_card);
false execVM "\atragmx\fnc_show_range_card_setup.sqf"; false call FUNC(show_range_card_setup);
false execVM "\atragmx\fnc_show_target_range_assist.sqf"; false call FUNC(show_target_range_assist);
false execVM "\atragmx\fnc_show_target_speed_assist.sqf"; false call FUNC(show_target_speed_assist);
false execVM "\atragmx\fnc_show_target_speed_assist_timer.sqf"; false call FUNC(show_target_speed_assist_timer);
{ {
lbAdd [6000, _x select 0]; lbAdd [6000, _x select 0];

View File

@ -6,8 +6,8 @@ if !(ctrlVisible 9000) then
{ {
private ["_startTime"]; private ["_startTime"];
false execVM "\atragmx\fnc_show_target_speed_assist.sqf"; false call FUNC(show_target_speed_assist);
true execVM "\atragmx\fnc_show_target_speed_assist_timer.sqf"; true call FUNC(show_target_speed_assist_timer);
ctrlSetFocus (_dsp displayCtrl 9002); ctrlSetFocus (_dsp displayCtrl 9002);
@ -25,6 +25,6 @@ if !(ctrlVisible 9000) then
[] call FUNC(calculate_target_speed_assist); [] call FUNC(calculate_target_speed_assist);
false execVM "\atragmx\fnc_show_target_speed_assist_timer.sqf"; false call FUNC(show_target_speed_assist_timer);
true execVM "\atragmx\fnc_show_target_speed_assist.sqf"; true call FUNC(show_target_speed_assist);
}; };

View File

@ -4,16 +4,16 @@
if (ctrlVisible 6000) then if (ctrlVisible 6000) then
{ {
false execVM "\atragmx\fnc_show_gun_list.sqf"; false call FUNC(show_gun_list);
true execVM "\atragmx\fnc_show_main_page.sqf"; true call FUNC(show_main_page);
if (_this) then { if (_this) then {
(lbCurSel 6000) call FUNC(change_gun); (lbCurSel 6000) call FUNC(change_gun);
}; };
} else } else
{ {
false execVM "\atragmx\fnc_show_main_page.sqf"; false call FUNC(show_main_page);
true execVM "\atragmx\fnc_show_gun_list.sqf"; true call FUNC(show_gun_list);
ctrlSetFocus (_dsp displayCtrl 6002); ctrlSetFocus (_dsp displayCtrl 6002);

View File

@ -4,12 +4,12 @@
if (ctrlVisible 5006) then if (ctrlVisible 5006) then
{ {
false execVM "\atragmx\fnc_show_range_card.sqf"; false call FUNC(show_range_card);
true execVM "\atragmx\fnc_show_main_page.sqf"; true call FUNC(show_main_page);
} else } else
{ {
false execVM "\atragmx\fnc_show_main_page.sqf"; false call FUNC(show_main_page);
true execVM "\atragmx\fnc_show_range_card.sqf"; true call FUNC(show_range_card);
ctrlSetFocus (_dsp displayCtrl 5001); ctrlSetFocus (_dsp displayCtrl 5001);

View File

@ -4,8 +4,8 @@
if (ctrlVisible 10000) then if (ctrlVisible 10000) then
{ {
false execVM "\atragmx\fnc_show_range_card_setup.sqf"; false call FUNC(show_range_card_setup);
true execVM "\atragmx\fnc_show_range_card.sqf"; true call FUNC(show_range_card);
if (_this == 1) then if (_this == 1) then
{ {
@ -18,8 +18,8 @@ if (ctrlVisible 10000) then
}; };
} else } else
{ {
false execVM "\atragmx\fnc_show_range_card.sqf"; false call FUNC(show_range_card);
true execVM "\atragmx\fnc_show_range_card_setup.sqf"; true call FUNC(show_range_card_setup);
ctrlSetFocus (_dsp displayCtrl 10006); ctrlSetFocus (_dsp displayCtrl 10006);

View File

@ -4,8 +4,8 @@
if (ctrlVisible 7000) then if (ctrlVisible 7000) then
{ {
false execVM "\atragmx\fnc_show_target_range_assist.sqf"; false call FUNC(show_target_range_assist);
true execVM "\atragmx\fnc_show_main_page.sqf"; true call FUNC(show_main_page);
if (_this == 1) then if (_this == 1) then
{ {
@ -14,8 +14,8 @@ if (ctrlVisible 7000) then
}; };
} else } else
{ {
false execVM "\atragmx\fnc_show_main_page.sqf"; false call FUNC(show_main_page);
true execVM "\atragmx\fnc_show_target_range_assist.sqf"; true call FUNC(show_target_range_assist);
ctrlSetFocus (_dsp displayCtrl 7018); ctrlSetFocus (_dsp displayCtrl 7018);

View File

@ -4,8 +4,8 @@
if (ctrlVisible 8000) then if (ctrlVisible 8000) then
{ {
false execVM "\atragmx\fnc_show_target_speed_assist.sqf"; false call FUNC(show_target_speed_assist);
true execVM "\atragmx\fnc_show_main_page.sqf"; true call FUNC(show_main_page);
if (_this == 1) then if (_this == 1) then
{ {
@ -14,8 +14,8 @@ if (ctrlVisible 8000) then
}; };
} else } else
{ {
false execVM "\atragmx\fnc_show_main_page.sqf"; false call FUNC(show_main_page);
true execVM "\atragmx\fnc_show_target_speed_assist.sqf"; true call FUNC(show_target_speed_assist);
ctrlSetFocus (_dsp displayCtrl 8012); ctrlSetFocus (_dsp displayCtrl 8012);