Skip to content

Commit 7863712

Browse files
PabstMirrorPabstMirror
committed
Merge branch 'master' into release-3.18.2
2 parents fe8ba46 + d819312 commit 7863712

22 files changed

+199
-153
lines changed

‎addons/arrays/fnc_getArrayElements.sqf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ while {_countA > 0} do {
2828
private _var = _array select 0;
2929
_array = _array - [_var];
3030
private _countB = count _array;
31-
_return = _return + [_var, _countA - _countB];
31+
_return append [_var, _countA - _countB];
3232
_countA = _countB;
3333
};
3434

‎addons/bitwise/stringtable.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@
33
<Package name="bitwise">
44
<Key ID="STR_CBA_bitwise_Component">
55
<English>Community Base Addons - Bitwise</English>
6+
<French>Community Base Addons - Bit par bit</French>
7+
<German>Community Base Addons - Bitweise</German>
8+
<Korean>커뮤니티 베이스 애드온 - 비트 연산</Korean>
9+
<Japanese>Community Base Addons - ビット演算</Japanese>
610
</Key>
711
</Package>
812
</Project>

‎addons/diagnostic/CfgEventHandlers.hpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ class Extended_PreInit_EventHandlers {
1212

1313
class Extended_DisplayLoad_EventHandlers {
1414
class RscDisplayDebugPublic {
15-
GVAR(extendedDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
15+
GVAR(extendedDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
1616
// remove scripted cancel button.
1717
GVAR(removeCancelButton) = "((_this select 0) displayCtrl 2) ctrlEnable false; ((_this select 0) displayCtrl 2) ctrlShow false;";
1818
};
1919
class RscDisplayInterrupt {
20-
GVAR(extendedDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
21-
GVAR(targetDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
20+
GVAR(extendedDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
21+
GVAR(targetDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
2222
};
2323
class RscDisplayMPInterrupt {
24-
GVAR(extendedDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
25-
GVAR(targetDebug) = QUOTE(_this call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
24+
GVAR(extendedDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initExtendedDebugConsole)'));
25+
GVAR(targetDebug) = QUOTE(call (uiNamespace getVariable 'FUNC(initTargetDebugConsole)'));
2626
};
2727
};

‎addons/diagnostic/stringtable.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<Spanish>4 Espacios</Spanish>
2424
<Italian>4 Spazi</Italian>
2525
<Polish>4 Spacje</Polish>
26+
<German>4 Leerzeichen</German>
2627
<Korean>네 공간</Korean>
2728
<Japanese>スペース4個</Japanese>
2829
<Chinese>4 個空格</Chinese>
@@ -35,6 +36,7 @@
3536
<Spanish>Espaciado de la Consola de Depuración</Spanish>
3637
<Italian>Indentazione console di debug</Italian>
3738
<Polish>Indentacja w konsoli debugowania</Polish>
39+
<German>Einrückungen in der Debug-Konsole</German>
3840
<Korean>디버그 콘솔 들여쓰기</Korean>
3941
<Japanese>デバッグコンソールのインデント</Japanese>
4042
<Chinese>調試控制台縮進</Chinese>
@@ -47,6 +49,7 @@
4749
<Spanish>Tipo de sangría que se puede agregar a la expresión en la consola de depuración presionando la tecla Tab o eliminar presionando Shift + Tab</Spanish>
4850
<Italian>Il tipo di intentazione che può essere aggiunta all'espressione nella console di debug premendo il tasto Tab o rimossa premendo Shift + Tab</Italian>
4951
<Polish>Rodzaj indentacji która może być dodana do wyrażenia w konsoli debugowania za pomocą klawisza Tab lub usunięta za pomocą Shift + Tab.</Polish>
52+
<German>Art der Einrückung, die dem Ausdruck in der Debug-Konsole durch Drücken von Tab hinzugefügt oder durch Drücken von Shift + Tab entfernt werden kann.</German>
5053
<Korean>Tab 키를 눌러서 디버그 콘솔의 식에 추가하거나 Shift + Tab을 눌러 제거할 수 있는 들여쓰기 유형입니다.</Korean>
5154
<Japanese>デバッグコンソールでのインデントのタイプ。 インデントはTabキーを押して追加、Shift + Tabキーを押して削除できる。</Japanese>
5255
<Chinese>可以通過按 Tab 鍵為添加到調試控制台中的表達式縮進或通過按 Shift + Tab 鍵為其刪除縮進。</Chinese>
@@ -146,6 +149,7 @@
146149
<English>Refresh rate target watcher field</English>
147150
<Czech>Pole cílového sledování obnovovací frekvence</Czech>
148151
<French>Taux de rafraîchissement champ de l'observateur cible</French>
152+
<German>Aktualisierungsrate für Zielüberwachungfelder</German>
149153
<Korean>대상 관찰자 필드 새로 고침 빈도</Korean>
150154
<Japanese>目標監視フィールドのリフレッシュレート</Japanese>
151155
<Chinese>刷新率</Chinese>
@@ -155,6 +159,7 @@
155159
<English>Refresh rate (in seconds) for the CBA target watcher fields to the right of the debug console.</English>
156160
<Czech>Obnovovací frekvence (v sekundách) pro pole sledování cíle CBA napravo od konzole ladění.</Czech>
157161
<French>Taux de rafraîchissement (en secondes) des champs d'observation de la cible CBA à droite de la console de débogage.</French>
162+
<German>Aktualisierungsrate (in Sekunden) für die CBA-Zielüberwachungsfelder auf der rechten Seite der Debug-Konsole.</German>
158163
<Korean>디버그 콘솔 오른쪽에 있는 CBA의 대상 관찰자 필드의 새로 고침 빈도입니다. (초 단위)</Korean>
159164
<Japanese>デバッグコンソールの右側にあるCBA目標監視フィールドのリフレッシュレート(秒単位)。</Japanese>
160165
<Chinese>調試控制台右側的 CBA 目標監視器字段的刷新率（以秒為單位）。</Chinese>

‎addons/disposable/CfgEventHandlers.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ class Extended_PreInit_EventHandlers {
1212

1313
class Extended_DisplayLoad_EventHandlers {
1414
class RscDisplayInventory {
15-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInventory)'));
15+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInventory)'));
1616
};
1717
};

‎addons/events/CfgEventHandlers.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ class Extended_PostInit_EventHandlers {
1818

1919
class Extended_DisplayLoad_EventHandlers {
2020
class RscDisplayMission {
21-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayMission)'));
21+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayMission)'));
2222
};
2323
class RscDiary {
2424
ADDON = QUOTE(if (ctrlIDD (_this select 0) == 12) then {_this call (uiNamespace getVariable 'FUNC(initDisplayMainMap)')};);
2525
};
2626
class RscDisplayCurator {
27-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
27+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayCurator)'));
2828
};
2929
};

‎addons/keybinding/CfgEventHandlers.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@ class Extended_PreInit_EventHandlers {
1212

1313
class Extended_DisplayLoad_EventHandlers {
1414
class RscDisplayConfigure {
15-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayConfigure)'));
15+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayConfigure)'));
1616
};
1717
};

‎addons/keybinding/gui.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class GVAR(key): RscControlsGroupNoScrollbars {
1717
class controls {
1818
class EditButton: RscButton {
1919
idc = IDC_KEY_EDIT;
20-
onButtonClick = QUOTE(_this call (uiNamespace getVariable 'FUNC(gui_editKey)'));
20+
onButtonClick = QUOTE(call (uiNamespace getVariable 'FUNC(gui_editKey)'));
2121
onMouseEnter = "(_this select 0) ctrlSetTextColor [0,0,0,1]";
2222
onMouseExit = "(_this select 0) ctrlSetTextColor [1,1,1,1]";
2323
style = ST_LEFT;
@@ -87,7 +87,7 @@ class GVAR(subCat): RscControlsGroupNoScrollbars {
8787
class RscDisplayConfigure {
8888
class controls {
8989
class CBA_ButtonConfigureAddons: RscButtonMenu {
90-
onButtonClick = QUOTE(_this call (uiNamespace getVariable 'FUNC(gui_configure)'));
90+
onButtonClick = QUOTE(call (uiNamespace getVariable 'FUNC(gui_configure)'));
9191
idc = IDC_BTN_CONFIGURE_ADDONS;
9292
text = CSTRING(configureAddons);
9393
x = QUOTE(POS_X(20.15));

‎addons/main/script_macros_common.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,8 +464,7 @@ Macros: TRACE_n()
464464
Author:
465465
Spooner
466466
------------------------------------------- */
467-
#define PFORMAT_1(MESSAGE,A) \
468-
format ['%1: A=%2', MESSAGE, RETNIL(A)]
467+
#define PFORMAT_1(MESSAGE,A) format ['%1: A=%2', MESSAGE, RETNIL(A)]
469468

470469
#define PFORMAT_2(MESSAGE,A,B) \
471470
format ['%1: A=%2, B=%3', MESSAGE, RETNIL(A), RETNIL(B)]

‎addons/optics/CfgEventHandlers.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ class Extended_PreInit_EventHandlers {
1212

1313
class Extended_DisplayLoad_EventHandlers {
1414
class RscDisplayInterrupt {
15-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
15+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
1616
};
1717
class RscDisplayMPInterrupt {
18-
ADDON = QUOTE(_this call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
18+
ADDON = QUOTE(call (uiNamespace getVariable 'FUNC(initDisplayInterrupt)'));
1919
};
2020
};

0 commit comments

Comments
 (0)