Merge pull request #1798 from Andx667/master

PabstMirror · web-flow · commit 7733c30b69c6 · 2025-12-19T13:32:35.000-06:00
General - Fix Typos and Spelling Errors in Comments
diff --git a/addons/common/delayless_loop.fsm b/addons/common/delayless_loop.fsm
@@ -25,7 +25,7 @@ class FSM
        "_c = count _this;" \n
        "_params = _this select 0;" \n
        "" \n
-       "// Handle optional paramters" \n
+       "// Handle optional parameters" \n
        "if (_c < 4) then { _this set [3, {}] };" \n
        "if (_c < 5) then { _this set [4, {}] };" \n
        "if (_c < 6) then { _this set [5, []] };" \n
@@ -84,4 +84,4 @@ class FSM
     "END"
   };
 };
-/*%FSM</COMPILE>*/
+/*%FSM</COMPILE>*/
diff --git a/addons/common/fnc_removeBackpackCargo.sqf b/addons/common/fnc_removeBackpackCargo.sqf
@@ -6,7 +6,7 @@ Description:
     Removes specific backpack(s) from cargo space.
 
     Warning: All weapon attachments/magazines in all backpacks in container will become detached.
-    Warning: Preset weapons without non-preset parents will get their attachments readded (engine limitation).
+    Warning: Preset weapons without non-preset parents will get their attachments re-added (engine limitation).
 
 Parameters:
     _container    - Object with cargo <OBJECT>
@@ -67,7 +67,7 @@ private _backpackData = [];
     _backpackData pushBack [typeOf _x, getItemCargo _x, magazinesAmmoCargo _x, weaponsItemsCargo _x];
 } forEach (everyBackpack _container); // [object1, object2, ...]
 
-// Clear cargo space and readd the items as long it's not the type in question
+// Clear cargo space and re-add the items as long as it's not the type in question
 clearBackpackCargoGlobal _container;
 
 
@@ -120,10 +120,10 @@ private _fnc_addContents = {
             [_container, _itemCargo, _magazinesAmmoCargo, _weaponsItemsCargo] call _fnc_addContents;
         };
     } else {
-        // Save all backpacks for finding the one we readd after this
+        // Save all backpacks for finding the one we re-add after this
         private _addedBackpacks = everyBackpack _container;
 
-        // Readd
+        // Re-add
         private _backpack = [_backpackClass, "CfgVehicles"] call CBA_fnc_getNonPresetClass;
         _container addBackpackCargoGlobal [_backpack, 1];
 
diff --git a/addons/common/fnc_removeItemCargo.sqf b/addons/common/fnc_removeItemCargo.sqf
@@ -6,7 +6,7 @@ Description:
     Removes specific item(s) from cargo space.
 
     Warning: All weapon attachments/magazines in containers in container will become detached.
-    Warning: Preset weapons without non-preset parents will get their attachments readded (engine limitation).
+    Warning: Preset weapons without non-preset parents will get their attachments re-added (engine limitation).
 
 Parameters:
     _container    - Object with cargo <OBJECT>
@@ -82,7 +82,7 @@ private _containerData = [];
     };
 } forEach _allItemsType;
 
-// Clear cargo space and readd the items as long it's not the type in question
+// Clear cargo space and re-add the items as long as it's not the type in question
 clearItemCargoGlobal _container;
 
 TRACE_1("Old cargo",_containerData);
@@ -135,7 +135,7 @@ private _fnc_addContents = {
             // Non-container item
             // Add with new count
             _container addItemCargoGlobal [_itemClass, _itemCargoOrCount - _count]; // Silently fails on 'count < 1'
-            TRACE_2("Readding",_itemClass,_itemCargoOrCount - _count);
+            TRACE_2("Re-adding",_itemClass,_itemCargoOrCount - _count);
 
             _count = 0;
         } else {
@@ -147,17 +147,17 @@ private _fnc_addContents = {
             };
         };
     } else {
-        // Readd only
+        // Re-add only
         if (count _x < 4) then {
             // Non-container item
             _container addItemCargoGlobal [_itemClass, _itemCargoOrCount];
-            TRACE_2("Readding",_itemClass,_itemCargoOrCount);
+            TRACE_2("Re-adding",_itemClass,_itemCargoOrCount);
         } else {
             // Container item
-            // Save all containers for finding the one we readd after this
+            // Save all containers for finding the one we re-add after this
             private _addedContainers = ((everyContainer _container) apply {_x select 1}) - everyBackpack _container;
 
-            // Readd
+            // Re-add
             private _addedContainer = [_itemClass] call CBA_fnc_getNonPresetClass;
             _container addItemCargoGlobal [_addedContainer, 1];
 
diff --git a/addons/common/fnc_removeWeaponCargo.sqf b/addons/common/fnc_removeWeaponCargo.sqf
@@ -6,7 +6,7 @@ Description:
     Removes specific weapon(s) from cargo space.
 
     Warning: All weapon attachments/magazines in container will become detached.
-    Warning: Preset weapons without non-preset parents will get their attachments readded (engine limitation).
+    Warning: Preset weapons without non-preset parents will get their attachments re-added (engine limitation).
 
 Parameters:
     _container       - Object with cargo <OBJECT>
@@ -64,7 +64,7 @@ _count = round _count;
 // Returns array in weaponsItems format
 private _weaponsItemsCargo = weaponsItemsCargo _container;
 
-// Clear cargo space and readd the items as long it's not the type in question
+// Clear cargo space and re-add the items as long as it's not the type in question
 clearWeaponCargoGlobal _container;
 
 {
diff --git a/addons/common/init_addMiscItemsToArsenal.sqf b/addons/common/init_addMiscItemsToArsenal.sqf
@@ -73,7 +73,7 @@ Author:
                     _ctrlList lbSetTooltip [_lbAdd * _columns,format ["%1\n%2",getText (_xCfg >> "displayName"),_x]];
                 };
 
-                // Add item to main list (will be used on next arsenalOpened automaticly)
+                // Add item to main list (will be used on next arsenalOpened automatically)
                 (bis_fnc_arsenal_data select IDC_RSCDISPLAYARSENAL_TAB_CARGOMISC) pushBack _x;
             } forEach _cbaMiscItems;
 
diff --git a/addons/diagnostic/fnc_debug.sqf b/addons/diagnostic/fnc_debug.sqf
@@ -65,7 +65,7 @@ if (_global) then {
     [QGVAR(debug), [_message, _title, [_useChat, _useLog, false]]] call CBA_fnc_remoteEvent;
 };
 
-// if string, split into seperate lines marked by "\n"
+// if string, split into separate lines marked by "\n"
 if (_message isEqualType "") then {
     _message = [_message, "\n"] call CBA_fnc_split;
 };
diff --git a/addons/events/XEH_preInit.sqf b/addons/events/XEH_preInit.sqf
@@ -4,7 +4,7 @@ ADDON = false;
 
 //ClientOwner command is unreliable in saved games
 //CBA_clientID will hold the correct value for the client's owner (needed for publicVariableClient and remoteExec)
-CBA_clientID = -1; //Will be -1 until real value recieved from server
+CBA_clientID = -1; //Will be -1 until real value received from server
 
 // Initialisation required by CBA events.
 GVAR(eventNamespace) = call CBA_fnc_createNamespace;
diff --git a/addons/settings/XEH_postInit.sqf b/addons/settings/XEH_postInit.sqf
@@ -1,6 +1,6 @@
 #include "script_component.hpp"
 
-// --- refresh all settings after postInit to guarantee that events are added and settings are recieved from server
+// --- refresh all settings after postInit to guarantee that events are added and settings are received from server
 {
     if (isNull GVAR(server)) then {
         ERROR("No server settings after postInit phase.");
diff --git a/addons/settings/fnc_import.sqf b/addons/settings/fnc_import.sqf
@@ -6,7 +6,7 @@ Description:
     Import all setting info from string.
 
 Parameters:
-    _info   - Formated settings info, (from CBA_settings_fnc_export) <STRING>
+    _info   - Formatted settings info, (from CBA_settings_fnc_export) <STRING>
     _source - Can be "client", "mission" or "server" (optional, default: "client") <STRING>
 
 Returns:
diff --git a/addons/statemachine/CBA_FSMEditor.cfg b/addons/statemachine/CBA_FSMEditor.cfg
@@ -44,7 +44,7 @@ class Compile {
 
         class State_Any {
             print_state = "class %(statename) {\n";
-            indent_stateContents = 8; //Neccessary to preserve formatting
+            indent_stateContents = 8; //Necessary to preserve formatting
             print_stateContents = "%(stateinit)\n";
             indent_stateOpen = 8;
 
@@ -53,7 +53,7 @@ class Compile {
                 indent_transitionOpen = 12;
                 print_target = "targetState = QUOTE(%(to));\n";
                 print_condition = "condition = QUOTE(%(condition));";
-                indent_transitionContents = 12; // Neccessary to preserve formatting.
+                indent_transitionContents = 12; // Necessary to preserve formatting.
                 print_transitionContents = "%(action)\n";
                 indent_transitionClose = 8;
                 print_transitionClose = "};\n";
diff --git a/addons/strings/fnc_formatNumber.sqf b/addons/strings/fnc_formatNumber.sqf
@@ -10,7 +10,7 @@ Description:
     the number 1.234e9 would be given as "1234000000").
 
     Additionally, if required, it will separate the integer part of the number
-    with the appropriate thousands seperators as, for example,
+    with the appropriate thousands separators as, for example,
     "21,002" or "1,000,000".
 
 Limitations:
diff --git a/addons/strings/fnc_removeWhitespace.sqf b/addons/strings/fnc_removeWhitespace.sqf
@@ -8,7 +8,7 @@ Description:
 
 Parameters:
     _string   - Any String <STRING>
-    _seperate - Seperate leftovers with spaces? (optional, default: false) <BOOLEAN>
+    _seperate - Separate leftovers with spaces? (optional, default: false) <BOOLEAN>
 
 Returns:
     String without whitespace <STRING>
diff --git a/addons/ui/flexiMenu/fnc_menu.sqf b/addons/ui/flexiMenu/fnc_menu.sqf
@@ -6,7 +6,7 @@ disableSerialization;
 // TODO: Consider adding: a base IDC override value.
 // TODO: Consider adding: a max buttons override value.
 // TODO: Consider adding: x,y menu offsets override values.
-// TODO: Consider adding: auto centering x,y menu offsets. Each menu dialog may need it's own center.sqf script.
+// TODO: Consider adding: auto centering x,y menu offsets. Each menu dialog may need its own center.sqf script.
 // TODO: Consider adding: menu properties source value.
 // TODO: Consider adding: "stay open" menu or menu option property (see menuStayOpenUponSelect), eg: for NV adjustment or VD adjustment, etc. TODO: Clarify: presumably upon releasing interact key. Close with right click.
 // TODO: Consider adding: pass parameters [object, caller] to action
@@ -21,7 +21,7 @@ disableSerialization;
 // TODO: _minObjectInteractionDistance: Find a very fast way to determine vehicle size and orientation to calc suitable dist.
 
 // Desc: Determine which menu resource to display. Create and init the menu using menu def's param.
-// Pass optional paramters (if used) to determine which menu to use and/or alter it's properties.
+// Pass optional parameters (if used) to determine which menu to use and/or alter its properties.
 
 // Note: Side effect of merging menus is that only the header of the first menu is retained.
 // TODO: Losing secondary headers will lose things like iconFolder. Perhaps auto merge into menuOptions in advance.
@@ -43,7 +43,7 @@ disableSerialization;
 // Syntax 3: [_source, _params]
 //   _this select 0 = menu definition source string
 //   _this select 1 = optional menu script parameters (type: any, syntax: any). Eg: ['menu name', 'menu resource name']
-//   Eg 3: array: [menu definition source string, paramters]. Eg: ["mission\ammoCrate_menuDef.sqf", ["main", _menuRsc]]
+//   Eg 3: array: [menu definition source string, parameters]. Eg: ["mission\ammoCrate_menuDef.sqf", ["main", _menuRsc]]
 //-----------------------------------------------------------------------------
 /* submenu is either:
     a menuDef array variable, - typeName "array"
@@ -71,7 +71,7 @@ disableSerialization;
 Note: visible allows value -1 (instead of 0) to make the current button be re-used for the next menu item, rather than hidden and left as a gap. It is dependent on the design of the menu dialog used.
 */
 
-// For each menu option, only the caption and action are required paramters. The other parameters are optional.
+// For each menu option, only the caption and action are required parameters. The other parameters are optional.
 /*
 [
     ["Menu Name": type Any, "Menu Caption": string, "menu dialog class or suffix id": string, "\ca\ui\data\": string, "menuStayOpenUponSelect": boolean],
diff --git a/addons/ui/flexiMenu/init.sqf b/addons/ui/flexiMenu/init.sqf
@@ -5,7 +5,7 @@ if (isDedicated) exitWith {false};
 // list of all menu activation keys and associated types
 GVAR(typeMenuSources) = []; // types, keys and menu sources data
 GVAR(target) = objNull; // current object for interaction
-GVAR(holdKeyDown) = false; // default global behaviour of requiring holding key down. Can be overriden by menus.
+GVAR(holdKeyDown) = false; // default global behaviour of requiring holding key down. Can be overridden by menus.
 GVAR(hotKeyColor) = ""; // override colour of hotkey. It is set from rsc menu file, upon opening either the "menu" or "list". If not present, a default will be used.
 
 // prevent instant reactivation of menu after selection was made, while key still held down. Value is reset upon key release.
diff --git a/addons/ui/fnc_initDisplayInterrupt.sqf b/addons/ui/fnc_initDisplayInterrupt.sqf
@@ -18,7 +18,7 @@ params ["_display"];
 private _buttons = [];
 _display setVariable [QGVAR(MenuButtons), _buttons];
 
-// inital button placement
+// initial button placement
 private _offset = -1.1 * (count GVAR(MenuButtons) + 4);
 if (!isMultiplayer && {getNumber (missionConfigFile >> "replaceAbortButton") > 0}) then {
     _offset = _offset - 1.1;
diff --git a/addons/vectors/XEH_preInit.sqf b/addons/vectors/XEH_preInit.sqf
@@ -3,7 +3,7 @@ SCRIPT(XEH_preInit);
 
 ADDON = false;
 
-// Since the following causes RPT spam of "Attempting to Override, we are no longer supporting this method of deprication code. -VM
+// Since the following causes RPT spam of "Attempting to Override, we are no longer supporting this method of deprecation code. -VM
 // TODO: Update the existing CBA_vect functions to contain the same code as the their BIS_fnc_ equivalents. -VM
 // DEPRECATE_SYS(DOUBLES(PREFIX,fnc_vectSubtract),BIS_fnc_vectorDiff);
 // DEPRECATE_SYS(DOUBLES(PREFIX,fnc_vectCross),BIS_fnc_crossProduct);
diff --git a/addons/versioning/XEH_postInit.sqf b/addons/versioning/XEH_postInit.sqf
@@ -27,7 +27,7 @@ if (!SLX_XEH_DisableLogging) then {
         private _class = (configFile >> "CfgPatches" >> (_dependencyInfo select 0));
         private _dependencyIsPresent = call compile format ["%1", (_dependencyInfo select 2)];
         if ((isNil "_dependencyIsPresent") || {!(_dependencyIsPresent isEqualType false)}) then {
-            //https://dev.withsix.com/issues/74516 - The code could return non-bool, if "true" is converted to "1" durring binarization
+            //https://dev.withsix.com/issues/74516 - The code could return non-bool, if "true" is converted to "1" during binarization
             WARNING("Versioning conditional return is bad" + str _x);
             _dependencyIsPresent = true;
         };
diff --git a/addons/versioning/XEH_postInitServer.sqf b/addons/versioning/XEH_postInitServer.sqf
@@ -10,7 +10,7 @@ publicVariable QGVAR(versions_server); // TODO: Deprecate?
 
 // Paranoid; yet pretty annoying gamebreaking issue :-)
 FUNC(paranoid) = {
-    diag_log [diag_frameNo, diag_tickTime, time, _this, "WARNING: Some client seems to have overriden the versions array; please report to CBA devs!"];
+    diag_log [diag_frameNo, diag_tickTime, time, _this, "WARNING: Some client seems to have overridden the versions array; please report to CBA devs!"];
     diag_log [GVAR(versions), GVAR(versions_serv)];
     if (isMultiplayer) then {
         GVAR(versions_serv) = + GVAR(versions);
diff --git a/addons/xeh/fnc_compileEventHandlers.sqf b/addons/xeh/fnc_compileEventHandlers.sqf
@@ -36,7 +36,7 @@ if (_allowRecompile) then {
     };
 };
 
-// note: format is never used for config parsing here, because of it's 8192 character limitation.
+// note: format is never used for config parsing here, because of its 8192 character limitation.
 
 {
     private _eventName = _x;
diff --git a/include/a3/ui_f/hpp/defineCommonColors.inc b/include/a3/ui_f/hpp/defineCommonColors.inc
@@ -313,4 +313,4 @@
 
 #define COLOR_SENSORS_DEFAULT_RGB	1.0, 1.0, 1.0
 #define COLOR_SENSORS_DEFAULT_A		1.0
-#define COLOR_SENSORS_DEFAULT_RGBA	{COLOR_SENSORS_DEFAULT_RGB,COLOR_SENSORS_DEFAULT_A}
+#define COLOR_SENSORS_DEFAULT_RGBA	{COLOR_SENSORS_DEFAULT_RGB,COLOR_SENSORS_DEFAULT_A}
diff --git a/include/a3/ui_f/hpp/defineResincl.inc b/include/a3/ui_f/hpp/defineResincl.inc
@@ -3197,4 +3197,4 @@ enum
 #define HZ_TANK_BOTH_TRACKS 32
 
 
-#endif
+#endif
diff --git a/tools/CBA_README.txt b/tools/CBA_README.txt
@@ -6,7 +6,7 @@ Online function library reference at http://dev-heaven.net/docs/cba/
 
 @CBA                                  => Copy this directory to your Arma II game directory (see manual for more details).
 @CBA_OA                               => Copy this aswell, but only if you have a standalone Operation Arrowhead installation.
-@CBA_A2                               => Copy this if you have ArmA II but not Arrowhead. 
+@CBA_A2                               => Copy this if you have ArmA II but not Arrowhead.
 @CBA/store/wiki.tar                   => Tar archive of the online wiki. This is a copy of the DevHeaven wiki at the time of release.
 @CBA/store/function_library.tar       => Tar archive of the the function/macro reference.
 @CBA/store/keys/                      => Server keys for addons.
@@ -20,12 +20,12 @@ What do I need?
 * You should always install the @CBA mod folder by copying it to your ArmA II installation
   folder.
 
-* If you have a "merged" or "seperate", Combined Operations installation with both the old ArmA II
+* If you have a "merged" or "separate", Combined Operations installation with both the old ArmA II
   content and the new Arrowhead expansion, you're done - you only need the @CBA mod folder.
 
 * If you only have a standalone Operation Arrowhead installation, you need both the @CBA
   and the @CBA_OA folders loaded.
-  
+
 * If you only have the older ArmA II installed, you need both the @CBA and the
   @CBA_A2 folders loaded.
 
diff --git a/tools/compile_sqf.py b/tools/compile_sqf.py
@@ -2,7 +2,7 @@
 import sys
 import subprocess
 
-# Handle script being called from either base or /tools folder (e.g. hemmt will run from base)
+# Handle script being called from either base or /tools folder (e.g. hemtt will run from base)
 addon_base_path = os.getcwd()
 if os.path.basename(addon_base_path) == "tools":
     addon_base_path = os.path.dirname(addon_base_path)
diff --git a/tools/overview.txt b/tools/overview.txt
@@ -6,7 +6,7 @@ The CBA functions library comprises a number of categories of functions such
 as arrays, hashes, strings and vectors. There are also functions for managing
 UI elements, custom events and key binds.
 
-As a support for the function libray, CBA also provides a number of preprocessor
+As a support for the function library, CBA also provides a number of preprocessor
 macros to aid in development.
 
 Features:

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`#include "script_component.hpp"`
`2`	`2`
`3`		`-// --- refresh all settings after postInit to guarantee that events are added and settings are recieved from server`
	`3`	`+// --- refresh all settings after postInit to guarantee that events are added and settings are received from server`
`4`	`4`	`{`
`5`	`5`	`if (isNull GVAR(server)) then {`
`6`	`6`	`ERROR("No server settings after postInit phase.");`