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

Fixed several typos

Browse Source
This commit is contained in:
ulteq 2015-04-06 21:11:02 +02:00
parent 6578ff4559
commit cab8603db6
7 changed files with 52 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
addons/atragmx/XEH_preInit.sqf
View File

@ -2,46 +2,46 @@
ADDON = false;
prep(add_new_gun);
prep(calculate_range_card);
prep(calculate_scope_base_angle);
prep(calculate_solution);
prep(calculate_target_range_assist);
prep(calculate_target_solution);
prep(calculate_target_speed_assist);
prep(change_gun);
prep(create_dialog);
prep(cycle_range_card_columns);
prep(cycle_scope_unit);
prep(delete_gun);
prep(init);
prep(parse_input);
prep(reset_relative_click_memory);
prep(save_gun);
prep(show_add_new_gun);
prep(show_gun_list);
prep(show_main_page);
prep(show_range_card);
prep(show_range_card_setup);
prep(show_target_range_assist);
prep(show_target_speed_assist);
prep(show_target_speed_assist_timer);
prep(sord);
prep(target_speed_assist_timer);
prep(toggle_gun_list);
prep(toggle_range_card);
prep(toggle_range_card_setup);
prep(toggle_target_range_assist);
prep(toggle_target_speed_assist);
prep(update_atmosphere);
prep(update_gun);
prep(update_range_card);
prep(update_relative_click_memory);
prep(update_result);
prep(update_scope_unit);
prep(update_target);
prep(update_target_selection);
prep(update_unit_selection);
prep(update_zero_range);
PREP(add_new_gun);
PREP(calculate_range_card);
PREP(calculate_scope_base_angle);
PREP(calculate_solution);
PREP(calculate_target_range_assist);
PREP(calculate_target_solution);
PREP(calculate_target_speed_assist);
PREP(change_gun);
PREP(create_dialog);
PREP(cycle_range_card_columns);
PREP(cycle_scope_unit);
PREP(delete_gun);
PREP(init);
PREP(parse_input);
PREP(reset_relative_click_memory);
PREP(save_gun);
PREP(show_add_new_gun);
PREP(show_gun_list);
PREP(show_main_page);
PREP(show_range_card);
PREP(show_range_card_setup);
PREP(show_target_range_assist);
PREP(show_target_speed_assist);
PREP(show_target_speed_assist_timer);
PREP(sord);
PREP(target_speed_assist_timer);
PREP(toggle_gun_list);
PREP(toggle_range_card);
PREP(toggle_range_card_setup);
PREP(toggle_target_range_assist);
PREP(toggle_target_speed_assist);
PREP(update_atmosphere);
PREP(update_gun);
PREP(update_range_card);
PREP(update_relative_click_memory);
PREP(update_result);
PREP(update_scope_unit);
PREP(update_target);
PREP(update_target_selection);
PREP(update_unit_selection);
PREP(update_zero_range);
ADDON = true;

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

@ -1,6 +1,6 @@
#include "script_component.hpp"
[] call FUNC(parse_input.sqf);
[] call FUNC(parse_input);
private ["_scopeBaseAngle"];
_scopeBaseAngle = ((GVAR(ATragMX_workingMemory) select GVAR(ATragMX_currentTarget)) select 3);

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

@ -74,7 +74,7 @@ while {_TOF < 15 && (_bulletPos select 1) < _targetRange} do
if (EGVAR(advanced_ballistics,AdvancedBallistics)) then {
if (EGVAR(advanced_ballistics,AdvancedAirDragEnabled)) then {
private ["_drag"];
_drag = -1 * ([_dragModel, _bc, _trueSpeed] call FUNC(calculateRetardation);
_drag = -1 * ([_dragModel, _bc, _trueSpeed] call EFUNC(advanced_ballistics,calculateRetardation));
_bulletAccel = (vectorNormalized _trueVelocity) vectorMultiply (_drag);
};
} else {

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

@ -1,8 +1,10 @@
#include "script_component.hpp"
systemChat "create_dialog";
if (dialog) exitWith { false };
if (underwater player) exitWith { false };
if (!("ATragMX" in (uniformItems player)) && !("ATragMX" in (vestItems player))) 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";

4
addons/atragmx/functions/fnc_init.sqf
View File

@ -1,7 +1,7 @@
#include "script_component.hpp"
if (isNil QUOTE(EGVAR(advanced_ballistics, AdvancedBallistics))) then { EGVAR(advanced_ballistics, AdvancedBallistics) = false; };
if (isNil QUOTE(EGVAR(advanced_ballistics, AdvancedAirDragEnabled))) then { EGVAR(advanced_ballistics, AdvancedAirDragEnabled) = false; };
if (isNil QUOTE(EGVAR(advanced_ballistics,AdvancedBallistics))) then { EGVAR(advanced_ballistics,AdvancedBallistics) = false; };
if (isNil QUOTE(EGVAR(advanced_ballistics,AdvancedAirDragEnabled))) then { EGVAR(advanced_ballistics,AdvancedAirDragEnabled) = false; };
GVAR(ATragMX_workingMemory) = [+(GVAR(ATragMX_gunList) select 0), +(GVAR(ATragMX_gunList) select 0), +(GVAR(ATragMX_gunList) select 0), +(GVAR(ATragMX_gunList) select 0)];

4
addons/atragmx/functions/fnc_parse_input.sqf
View File

@ -13,7 +13,7 @@ GVAR(ATragMX_targetRange) set [GVAR(ATragMX_currentTarget), 0 max abs(parseNumbe
private ["_boreHeight", "_bulletMass", "_airFriction", "_muzzleVelocity"];
_boreHeight = parseNumber(ctrlText 100);
_bulletMass = parseNumber(ctrlText 110);
if (AdvancedBallistics && AB_AdvancedAirDragEnabled) then {
if (EGVAR(advanced_ballistics,AdvancedBallistics) && EGVAR(advanced_ballistics,AdvancedAirDragEnabled)) then {
_airFriction = 0.1 max parseNumber(ctrlText 120) min 2;
} else {
_airFriction = parseNumber(ctrlText 120) / -1000;
@ -31,7 +31,7 @@ _muzzleVelocity = 100 max _muzzleVelocity min 1400;
(GVAR(ATragMX_workingMemory) select GVAR(ATragMX_currentTarget)) set [5, _boreHeight];
(GVAR(ATragMX_workingMemory) select GVAR(ATragMX_currentTarget)) set [12, _bulletMass];
if (AdvancedBallistics && AB_AdvancedAirDragEnabled) then {
if (EGVAR(advanced_ballistics,AdvancedBallistics) && EGVAR(advanced_ballistics,AdvancedAirDragEnabled)) then {
(GVAR(ATragMX_workingMemory) select GVAR(ATragMX_currentTarget)) set [15, _airFriction];
} else {
(GVAR(ATragMX_workingMemory) select GVAR(ATragMX_currentTarget)) set [4, _airFriction];

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

@ -15,7 +15,7 @@ if (GVAR(ATragMX_currentUnit) == 1) then
{
ctrlSetText [ 110, Str(Round((GVAR(ATragMX_workingMemory) select GVAR(ATragMX_currentTarget)) select 12))];
};
if (AdvancedBallistics && AB_AdvancedAirDragEnabled) then {
if (EGVAR(advanced_ballistics,AdvancedBallistics) && EGVAR(advanced_ballistics,AdvancedAirDragEnabled)) then {
ctrlSetText [ 120, Str(Round(((GVAR(ATragMX_workingMemory) select GVAR(ATragMX_currentTarget)) select 15) * 1000) / 1000)];
} else {
ctrlSetText [ 120, Str(Round(((GVAR(ATragMX_workingMemory) select GVAR(ATragMX_currentTarget)) select 4) * -1000 * 1000) / 1000)];