From 91be37c6f317ac720a10d4b96018ca089c729a8c Mon Sep 17 00:00:00 2001 From: ulteq Date: Mon, 6 Apr 2015 21:41:07 +0200 Subject: [PATCH] Replaced all execVM occurrences --- addons/atragmx/RscTitles.hpp | 2 +- .../atragmx/functions/fnc_create_dialog.sqf | 20 +++++++++---------- .../fnc_target_speed_assist_timer.sqf | 8 ++++---- .../atragmx/functions/fnc_toggle_gun_list.sqf | 8 ++++---- .../functions/fnc_toggle_range_card.sqf | 8 ++++---- .../functions/fnc_toggle_range_card_setup.sqf | 8 ++++---- .../fnc_toggle_target_range_assist.sqf | 8 ++++---- .../fnc_toggle_target_speed_assist.sqf | 8 ++++---- 8 files changed, 34 insertions(+), 36 deletions(-) diff --git a/addons/atragmx/RscTitles.hpp b/addons/atragmx/RscTitles.hpp index 42fe9f9e91..0abed8e643 100644 --- a/addons/atragmx/RscTitles.hpp +++ b/addons/atragmx/RscTitles.hpp @@ -1042,7 +1042,7 @@ class ATragMX_Display idc=8010; y=0.265*safezoneH+safezoneY+0.5; 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 { diff --git a/addons/atragmx/functions/fnc_create_dialog.sqf b/addons/atragmx/functions/fnc_create_dialog.sqf index c045693dac..9a18c0eb60 100644 --- a/addons/atragmx/functions/fnc_create_dialog.sqf +++ b/addons/atragmx/functions/fnc_create_dialog.sqf @@ -1,24 +1,22 @@ #include "script_component.hpp" -systemChat "create_dialog"; - if (dialog) exitWith { false }; if (underwater 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'; -true execVM "\atragmx\fnc_show_main_page.sqf"; +true call FUNC(show_main_page); -false execVM "\atragmx\fnc_show_add_new_gun.sqf"; -false execVM "\atragmx\fnc_show_gun_list.sqf"; -false execVM "\atragmx\fnc_show_range_card.sqf"; -false execVM "\atragmx\fnc_show_range_card_setup.sqf"; -false execVM "\atragmx\fnc_show_target_range_assist.sqf"; -false execVM "\atragmx\fnc_show_target_speed_assist.sqf"; -false execVM "\atragmx\fnc_show_target_speed_assist_timer.sqf"; +false call FUNC(show_add_new_gun); +false call FUNC(show_gun_list); +false call FUNC(show_range_card); +false call FUNC(show_range_card_setup); +false call FUNC(show_target_range_assist); +false call FUNC(show_target_speed_assist); +false call FUNC(show_target_speed_assist_timer); { lbAdd [6000, _x select 0]; diff --git a/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf b/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf index bd2bc2d9ae..57a2aad358 100644 --- a/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf +++ b/addons/atragmx/functions/fnc_target_speed_assist_timer.sqf @@ -6,8 +6,8 @@ if !(ctrlVisible 9000) then { private ["_startTime"]; - false execVM "\atragmx\fnc_show_target_speed_assist.sqf"; - true execVM "\atragmx\fnc_show_target_speed_assist_timer.sqf"; + false call FUNC(show_target_speed_assist); + true call FUNC(show_target_speed_assist_timer); ctrlSetFocus (_dsp displayCtrl 9002); @@ -25,6 +25,6 @@ if !(ctrlVisible 9000) then [] call FUNC(calculate_target_speed_assist); - false execVM "\atragmx\fnc_show_target_speed_assist_timer.sqf"; - true execVM "\atragmx\fnc_show_target_speed_assist.sqf"; + false call FUNC(show_target_speed_assist_timer); + true call FUNC(show_target_speed_assist); }; diff --git a/addons/atragmx/functions/fnc_toggle_gun_list.sqf b/addons/atragmx/functions/fnc_toggle_gun_list.sqf index 6969ae1f75..59abdb9f63 100644 --- a/addons/atragmx/functions/fnc_toggle_gun_list.sqf +++ b/addons/atragmx/functions/fnc_toggle_gun_list.sqf @@ -4,16 +4,16 @@ if (ctrlVisible 6000) then { - false execVM "\atragmx\fnc_show_gun_list.sqf"; - true execVM "\atragmx\fnc_show_main_page.sqf"; + false call FUNC(show_gun_list); + true call FUNC(show_main_page); if (_this) then { (lbCurSel 6000) call FUNC(change_gun); }; } else { - false execVM "\atragmx\fnc_show_main_page.sqf"; - true execVM "\atragmx\fnc_show_gun_list.sqf"; + false call FUNC(show_main_page); + true call FUNC(show_gun_list); ctrlSetFocus (_dsp displayCtrl 6002); diff --git a/addons/atragmx/functions/fnc_toggle_range_card.sqf b/addons/atragmx/functions/fnc_toggle_range_card.sqf index a67044ab1a..74ca96a2d6 100644 --- a/addons/atragmx/functions/fnc_toggle_range_card.sqf +++ b/addons/atragmx/functions/fnc_toggle_range_card.sqf @@ -4,12 +4,12 @@ if (ctrlVisible 5006) then { - false execVM "\atragmx\fnc_show_range_card.sqf"; - true execVM "\atragmx\fnc_show_main_page.sqf"; + false call FUNC(show_range_card); + true call FUNC(show_main_page); } else { - false execVM "\atragmx\fnc_show_main_page.sqf"; - true execVM "\atragmx\fnc_show_range_card.sqf"; + false call FUNC(show_main_page); + true call FUNC(show_range_card); ctrlSetFocus (_dsp displayCtrl 5001); diff --git a/addons/atragmx/functions/fnc_toggle_range_card_setup.sqf b/addons/atragmx/functions/fnc_toggle_range_card_setup.sqf index d2e161ab5a..e205bc3771 100644 --- a/addons/atragmx/functions/fnc_toggle_range_card_setup.sqf +++ b/addons/atragmx/functions/fnc_toggle_range_card_setup.sqf @@ -4,8 +4,8 @@ if (ctrlVisible 10000) then { - false execVM "\atragmx\fnc_show_range_card_setup.sqf"; - true execVM "\atragmx\fnc_show_range_card.sqf"; + false call FUNC(show_range_card_setup); + true call FUNC(show_range_card); if (_this == 1) then { @@ -18,8 +18,8 @@ if (ctrlVisible 10000) then }; } else { - false execVM "\atragmx\fnc_show_range_card.sqf"; - true execVM "\atragmx\fnc_show_range_card_setup.sqf"; + false call FUNC(show_range_card); + true call FUNC(show_range_card_setup); ctrlSetFocus (_dsp displayCtrl 10006); diff --git a/addons/atragmx/functions/fnc_toggle_target_range_assist.sqf b/addons/atragmx/functions/fnc_toggle_target_range_assist.sqf index 1819f0ac73..2b92c36a74 100644 --- a/addons/atragmx/functions/fnc_toggle_target_range_assist.sqf +++ b/addons/atragmx/functions/fnc_toggle_target_range_assist.sqf @@ -4,8 +4,8 @@ if (ctrlVisible 7000) then { - false execVM "\atragmx\fnc_show_target_range_assist.sqf"; - true execVM "\atragmx\fnc_show_main_page.sqf"; + false call FUNC(show_target_range_assist); + true call FUNC(show_main_page); if (_this == 1) then { @@ -14,8 +14,8 @@ if (ctrlVisible 7000) then }; } else { - false execVM "\atragmx\fnc_show_main_page.sqf"; - true execVM "\atragmx\fnc_show_target_range_assist.sqf"; + false call FUNC(show_main_page); + true call FUNC(show_target_range_assist); ctrlSetFocus (_dsp displayCtrl 7018); diff --git a/addons/atragmx/functions/fnc_toggle_target_speed_assist.sqf b/addons/atragmx/functions/fnc_toggle_target_speed_assist.sqf index 7c5cda4387..5c0f06051c 100644 --- a/addons/atragmx/functions/fnc_toggle_target_speed_assist.sqf +++ b/addons/atragmx/functions/fnc_toggle_target_speed_assist.sqf @@ -4,8 +4,8 @@ if (ctrlVisible 8000) then { - false execVM "\atragmx\fnc_show_target_speed_assist.sqf"; - true execVM "\atragmx\fnc_show_main_page.sqf"; + false call FUNC(show_target_speed_assist); + true call FUNC(show_main_page); if (_this == 1) then { @@ -14,8 +14,8 @@ if (ctrlVisible 8000) then }; } else { - false execVM "\atragmx\fnc_show_main_page.sqf"; - true execVM "\atragmx\fnc_show_target_speed_assist.sqf"; + false call FUNC(show_main_page); + true call FUNC(show_target_speed_assist); ctrlSetFocus (_dsp displayCtrl 8012);