From e44246b244a77a1b8b13f7b235a64f3abd8934b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl?= Date: Mon, 9 Jan 2023 21:51:25 +0100 Subject: [PATCH] - Removed tabs - Fixed calculating error --- .../functions/fnc_onButtonClickConfirm.sqf | 136 +++++++++--------- addons/markers/initSettings.sqf | 120 ++++++++-------- 2 files changed, 128 insertions(+), 128 deletions(-) diff --git a/addons/markers/functions/fnc_onButtonClickConfirm.sqf b/addons/markers/functions/fnc_onButtonClickConfirm.sqf index b83af5419d..b1058b88ed 100644 --- a/addons/markers/functions/fnc_onButtonClickConfirm.sqf +++ b/addons/markers/functions/fnc_onButtonClickConfirm.sqf @@ -1,19 +1,19 @@ #include "script_component.hpp" /* - * Author: Freddo - * When the confirm button is pressed. - * - * Arguments: - * 0: Confirm button - * - * Return Value: - * None - * - * Example: - * [_buttonOk] call ACE_markers_fnc_onButtonClickConfirm - * - * Public: No - */ +* Author: Freddo, Daniël H. +* When the confirm button is pressed. +* +* Arguments: +* 0: Confirm button +* +* Return Value: +* None +* +* Example: +* [_buttonOk] call ACE_markers_fnc_onButtonClickConfirm +* +* Public: No +*/ params ["_buttonOk"]; private _display = ctrlParent _buttonOk; @@ -22,60 +22,60 @@ private _aceTimestamp = _display displayCtrl IDC_ACE_INSERT_MARKER_TIMESTAMP; // handle timestamp if (cbChecked _aceTimestamp && { - ACE_player call FUNC(canTimestamp) +ACE_player call FUNC(canTimestamp) }) then { - private _time = []; +private _time = []; - switch (GVAR(timestampTimezone)) do - { - default - { - _time = dayTime; - }; - case 1: - { - systemTime params ["", "", "", "_hour", "_min", "_sec"]; - _time = _hour + _min/60 + _sec/3600; - }; - case 2: - { - _offset = GVAR(timestampUTCOffset); - systemTimeUTC params["", "", "", "_hour", "_min", "_sec"]; - _hour = _hour + _offset; - if (_hour < 0) then { - _hour = 24 - _hour; - }; - if (_hour > 24) then { - _hour = 0 + (_hour - 24); - }; - _time = _hour + _min/60 + _sec/3600; - }; - }; - - // add timestamp suffix - private _periodPostfix = ""; - if (GVAR(timestampHourFormat) == 12) then { - if (floor _time == 0) exitWith { - _time = _time + 12; - _periodPostfix = " am"; - }; - - if (floor _time == 12) exitWith { - _periodPostfix = " pm"; - }; - - if (_time < 12) then { - _periodPostfix = " am"; - } else { - _time = _time - 12; - _periodPostfix = " pm"; - }; - }; - - _description ctrlSetText format [ - "%1 [%2%3]", - ctrlText _description, - [_time, GVAR(timestampFormat)] call BIS_fnc_timeToString, - _periodPostfix - ]; +switch (GVAR(timestampTimezone)) do +{ +default +{ +_time = dayTime; }; +case 1: +{ +systemTime params ["", "", "", "_hour", "_min", "_sec"]; +_time = _hour + _min/60 + _sec/3600; +}; +case 2: +{ +_offset = GVAR(timestampUTCOffset); +systemTimeUTC params["", "", "", "_hour", "_min", "_sec"]; +_hour = _hour + _offset; +if (_hour < 0) then { +_hour = 24 + _hour; +}; +if (_hour > 24) then { +_hour = _hour - 24; +}; +_time = _hour + _min/60 + _sec/3600; +}; +}; + +// add timestamp suffix +private _periodPostfix = ""; +if (GVAR(timestampHourFormat) == 12) then { +if (floor _time == 0) exitWith { +_time = _time + 12; +_periodPostfix = " am"; +}; + +if (floor _time == 12) exitWith { +_periodPostfix = " pm"; +}; + +if (_time < 12) then { +_periodPostfix = " am"; +} else { +_time = _time - 12; +_periodPostfix = " pm"; +}; +}; + +_description ctrlSetText format [ +"%1 [%2%3]", +ctrlText _description, +[_time, GVAR(timestampFormat)] call BIS_fnc_timeToString, +_periodPostfix +]; +}; \ No newline at end of file diff --git a/addons/markers/initSettings.sqf b/addons/markers/initSettings.sqf index 793d992e0b..6fe9566375 100644 --- a/addons/markers/initSettings.sqf +++ b/addons/markers/initSettings.sqf @@ -1,81 +1,81 @@ -private _categoryName = format ["ACE %1", localize ELSTRING(map,Module_DisplayName)]; +private _categoryName = format ["ACE %1", localize ELSTRING(map, Module_DisplayName)]; [ - QGVAR(moveRestriction), "LIST", - [LSTRING(MoveRestriction), LSTRING(MoveRestriction_Description)], - [_categoryName, LLSTRING(Module_DisplayName)], - [ - [ - MOVE_RESTRICTION_NOBODY, - MOVE_RESTRICTION_ALL, - MOVE_RESTRICTION_ADMINS, - MOVE_RESTRICTION_GROUP_LEADERS, - MOVE_RESTRICTION_GROUP_LEADERS_ADMINS, - MOVE_RESTRICTION_OWNER - ], - [ - LSTRING(MoveRestriction_Nobody), - LSTRING(MoveRestriction_All), - LSTRING(MoveRestriction_Admins), - LSTRING(MoveRestriction_GroupLeaders), - LSTRING(MoveRestriction_GroupLeadersAndAdmins), - LSTRING(MoveRestriction_Owner) - ], - 1 - ] +QGVAR(moveRestriction), "LIST", +[LSTRING(MoveRestriction), LSTRING(MoveRestriction_Description)], +[_categoryName, LLSTRING(Module_DisplayName)], +[ +[ +MOVE_RESTRICTION_NOBODY, +MOVE_RESTRICTION_ALL, +MOVE_RESTRICTION_ADMINS, +MOVE_RESTRICTION_GROUP_LEADERS, +MOVE_RESTRICTION_GROUP_LEADERS_ADMINS, +MOVE_RESTRICTION_OWNER +], +[ +LSTRING(MoveRestriction_Nobody), +LSTRING(MoveRestriction_All), +LSTRING(MoveRestriction_Admins), +LSTRING(MoveRestriction_GroupLeaders), +LSTRING(MoveRestriction_GroupLeadersAndAdmins), +LSTRING(MoveRestriction_Owner) +], +1 +] ] call CBA_fnc_addSetting; [ - QGVAR(timestampEnabled), "CHECKBOX", - [LSTRING(TimestampEnabled), LSTRING(TimestampEnabledDescription)], - [_categoryName, LLSTRING(Module_DisplayName)], - true +QGVAR(timestampEnabled), "CHECKBOX", +[LSTRING(TimestampEnabled), LSTRING(TimestampEnabledDescription)], +[_categoryName, LLSTRING(Module_DisplayName)], +true ] call CBA_fnc_addSetting; [ - QGVAR(timestampTimezone), "LIST", - [LSTRING(TimestampTimezone), LSTRING(TimestampTimezoneDescription)], - [_categoryName, LLSTRING(Module_DisplayName)], - [ - [0, 1, 2], - [LSTRING(TimestampTimezoneIngameTime), LSTRING(TimestampTimezoneSystemTime), LSTRING(TimestampTimezoneUTCTime)], - 0 - ] +QGVAR(timestampTimezone), "LIST", +[LSTRING(TimestampTimezone), LSTRING(TimestampTimezoneDescription)], +[_categoryName, LLSTRING(Module_DisplayName)], +[ + [0, 1, 2], + [LSTRING(TimestampTimezoneIngameTime), LSTRING(TimestampTimezoneSystemTime), LSTRING(TimestampTimezoneUTCTime)], + 0 +] ] call CBA_fnc_addSetting; [ - QGVAR(timestampUTCOffset), "SLIDER", - [LSTRING(TimestampUTCOffset), LSTRING(TimestampUTCOffsetDescription)], - [_categoryName, LLSTRING(Module_DisplayName)], - [-12, 12, 0, 0] +QGVAR(timestampUTCOffset), "SLIDER", +[LSTRING(TimestampUTCOffset), LSTRING(TimestampUTCOffsetDescription)], +[_categoryName, LLSTRING(Module_DisplayName)], +[-12, 12, 0, 0] ] call CBA_fnc_addSetting; [ - QGVAR(timestampHourFormat), "LIST", - [LSTRING(TimestampHourFormat), LSTRING(TimestampHourFormatDescription)], - [_categoryName, LLSTRING(Module_DisplayName)], - [ - [24, 12], - [LSTRING(TimestampHourFormat24), LSTRING(TimestampHourFormat12)], - 0 - ] +QGVAR(timestampHourFormat), "LIST", +[LSTRING(TimestampHourFormat), LSTRING(TimestampHourFormatDescription)], +[_categoryName, LLSTRING(Module_DisplayName)], +[ + [24, 12], + [LSTRING(TimestampHourFormat24), LSTRING(TimestampHourFormat12)], + 0 +] ] call CBA_fnc_addSetting; private _formatDescription = [ - LLSTRING(TimestampFormatDescription0), - LLSTRING(TimestampFormatDescription1), - LLSTRING(TimestampFormatDescription2), - LLSTRING(TimestampFormatDescription3), - LLSTRING(TimestampFormatDescription4) +LLSTRING(TimestampFormatDescription0), +LLSTRING(TimestampFormatDescription1), +LLSTRING(TimestampFormatDescription2), +LLSTRING(TimestampFormatDescription3), +LLSTRING(TimestampFormatDescription4) ] joinString endl; [ - QGVAR(timestampFormat), "LIST", - [LSTRING(timestampFormat), _formatDescription], - [_categoryName, LLSTRING(Module_DisplayName)], - [ - ["HH", "HH:MM", "HH:MM:SS", "HH:MM:SS:MM"], - ["HH", "HH:MM", "HH:MM:SS", "HH:MM:SS:MM"], - 1 - ] +QGVAR(timestampFormat), "LIST", +[LSTRING(timestampFormat), _formatDescription], +[_categoryName, LLSTRING(Module_DisplayName)], +[ + ["HH", "HH:MM", "HH:MM:SS", "HH:MM:SS:MM"], + ["HH", "HH:MM", "HH:MM:SS", "HH:MM:SS:MM"], + 1 +] ] call CBA_fnc_addSetting; \ No newline at end of file