[WIP] Fix script errors reporting wrong line numbers (#937)

* fnc_currentUnit * common * accessory * ai * arrays * diagnostic * events * hashes 1 * jr * keybinding * modules * music * network * settings * statemachine * strings * ui * vectors * xeh * Manual fixups * delete whitespace * remove whitespace, weird formatting * return value formatting * whitespace, macro formatting * formatting white space, fix a macro position * move a include to fix error line numbers * remove whitespace * move a macro, whitespace, formatting * formatting * fix formatting * fix formatting * formatting * formatting
CBATeam · Jun 30, 2018 · fbd59d2 · fbd59d2
1 parent 04b12f8
commit fbd59d2
Show file tree

Hide file tree

Showing 266 changed files with 285 additions and 381 deletions.
diff --git a/addons/accessory/fnc_switchAttachment.sqf b/addons/accessory/fnc_switchAttachment.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_accessory_fnc_switchAttachment
 
@@ -20,7 +21,6 @@ Examples:
 Author:
     Robalo, optimized by Anton
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 
 params ["_itemType", "_switchTo"];
 

diff --git a/addons/ai/fnc_addWaypoint.sqf b/addons/ai/fnc_addWaypoint.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_addWaypoint
 
@@ -31,7 +32,6 @@ Author:
     Rommel
 
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 params [
     "_group",
     "_position",

diff --git a/addons/ai/fnc_clearWaypoints.sqf b/addons/ai/fnc_clearWaypoints.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_clearWaypoints
 
@@ -19,7 +20,6 @@ Author:
     SilentSpike
 
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 params [["_group", grpNull, [grpNull, objNull]]];
 _group = _group call CBA_fnc_getGroup;
 

diff --git a/addons/ai/fnc_taskAttack.sqf b/addons/ai/fnc_taskAttack.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_taskAttack
 
@@ -25,8 +26,6 @@ Author:
 
 ---------------------------------------------------------------------------- */
 
-#include "script_component.hpp"
-
 params ["_group", "_position", ["_radius", 0], ["_override", false]];
 
 _group = _group call CBA_fnc_getGroup;

diff --git a/addons/ai/fnc_taskPatrol.sqf b/addons/ai/fnc_taskPatrol.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_taskPatrol
 
@@ -33,8 +34,6 @@ Author:
 
 ---------------------------------------------------------------------------- */
 
-#include "script_component.hpp"
-
 params [
     ["_group", grpNull, [grpNull, objNull]],
     ["_position", [], [[], objNull, grpNull, locationNull], [2, 3]],

diff --git a/addons/ai/fnc_taskSearchArea.sqf b/addons/ai/fnc_taskSearchArea.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_taskSearchArea
 
@@ -30,7 +31,6 @@ Examples:
 Author:
     SilentSpike 2015-08-17
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 params [
     ["_group", objNull, [objNull,grpNull]],
     ["_area", "", ["",objNull, locationNull,[]], 5],

diff --git a/addons/ai/fnc_waypointGarrison.sqf b/addons/ai/fnc_waypointGarrison.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Script: fnc_waypointGarrison
 
@@ -21,7 +22,6 @@ Examples:
 Author:
     commy2
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 
 #define POP_RAND(array) (array deleteAt floor random count array)
 

diff --git a/addons/arrays/fnc_filter.sqf b/addons/arrays/fnc_filter.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_filter
 
@@ -32,7 +33,6 @@ Examples:
 Author:
     Spooner, commy2
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(filter);
 
 params [["_array", [], [[]]], ["_filter", {_x}, [{}]], ["_inPlace", false, [false]]];

diff --git a/addons/arrays/fnc_findMax.sqf b/addons/arrays/fnc_findMax.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_findMax
 
@@ -21,7 +22,6 @@ Author:
     joko // Jonas, commy2, Dorbedo
 
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(findMax);
 
 [_this] params [["_array", [], [[]]]];

diff --git a/addons/arrays/fnc_findMin.sqf b/addons/arrays/fnc_findMin.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_findMin
 
@@ -21,7 +22,6 @@ Author:
     joko // Jonas, commy2, Dorbedo
 
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(findMin);
 
 [_this] params [["_array", [], [[]]]];

diff --git a/addons/arrays/fnc_findNil.sqf b/addons/arrays/fnc_findNil.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_findNil
 
@@ -18,7 +19,6 @@ Returns:
 Author:
     joko // Jonas
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 
 [_this] params [["_array", [], [[]]]];
 

diff --git a/addons/arrays/fnc_findNull.sqf b/addons/arrays/fnc_findNull.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_findNull
 
@@ -18,7 +19,6 @@ Returns:
 Author:
     joko // Jonas
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 
 [_this] params [["_array", [], [[]]]];
 

diff --git a/addons/arrays/fnc_findTypeName.sqf b/addons/arrays/fnc_findTypeName.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_findTypeName
 
@@ -19,7 +20,6 @@ Returns:
 Author:
     joko // Jonas
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 
 #define TYPENAMES ["ARRAY", "BOOL", "CODE", "CONFIG", "CONTROL", "DISPLAY", "GROUP", "LOCATION", "OBJECT", "SCALAR", "SCRIPT", "SIDE", "STRING", "TASK", "TEXT", "TEAM_MEMBER", "NAMESPACE"]
 

diff --git a/addons/arrays/fnc_findTypeOf.sqf b/addons/arrays/fnc_findTypeOf.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_findTypeOf
 
@@ -21,7 +22,6 @@ Returns:
 Author:
     joko // Jonas
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 
 scopeName "main";
 

diff --git a/addons/arrays/fnc_getArrayDiff.sqf b/addons/arrays/fnc_getArrayDiff.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_getArrayDiff
 
@@ -20,8 +21,6 @@ Author:
 
 ---------------------------------------------------------------------------- */
 
-#include "script_component.hpp"
-
 #define NULL "$null$"
 
 params ["_arrayA", "_arrayB"];

diff --git a/addons/arrays/fnc_inject.sqf b/addons/arrays/fnc_inject.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_inject
 
@@ -33,8 +34,6 @@ Author:
     Spooner
 ---------------------------------------------------------------------------- */
 
-#include "script_component.hpp"
-
 SCRIPT(inject);
 
 // -----------------------------------------------------------------------------

diff --git a/addons/arrays/fnc_insert.sqf b/addons/arrays/fnc_insert.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_insert
 
@@ -24,7 +25,6 @@ Examples:
 Author:
     654wak654
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 #define ARRAY_ELEMENT_LIMIT 1E7
 SCRIPT(insert);
 

diff --git a/addons/arrays/fnc_join.sqf b/addons/arrays/fnc_join.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_join
 
@@ -29,8 +30,6 @@ Author:
     Spooner
 ---------------------------------------------------------------------------- */
 
-#include "script_component.hpp"
-
 SCRIPT(join);
 
 // ----------------------------------------------------------------------------

diff --git a/addons/arrays/fnc_reject.sqf b/addons/arrays/fnc_reject.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_reject
 
@@ -21,8 +22,6 @@ Author:
     MuzzleFlash
 ---------------------------------------------------------------------------- */
 
-#include "script_component.hpp"
-
 SCRIPT(reject);
 
 // ----------------------------------------------------------------------------

diff --git a/addons/arrays/fnc_select.sqf b/addons/arrays/fnc_select.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_select
 
@@ -21,8 +22,6 @@ Author:
     MuzzleFlash
 ---------------------------------------------------------------------------- */
 
-#include "script_component.hpp"
-
 SCRIPT(select);
 
 // ----------------------------------------------------------------------------

diff --git a/addons/arrays/fnc_shuffle.sqf b/addons/arrays/fnc_shuffle.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_shuffle
 
@@ -24,7 +25,6 @@ Author:
     toadlife (version 1.01) http://toadlife.net
     rewritten by Spooner, Dorbedo
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(shuffle);
 
 params [["_array", [], [[]]], ["_inPlace", false, [false]]];

diff --git a/addons/arrays/fnc_sortNestedArray.sqf b/addons/arrays/fnc_sortNestedArray.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_sortNestedArray
 
@@ -23,7 +24,6 @@ Returns:
 Author:
     commy2
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(sortNestedArray);
 
 params [["_array", [], [[]]], ["_index", 0, [0]], ["_order", true, [false]]];

diff --git a/addons/common/fnc_actionArgument.sqf b/addons/common/fnc_actionArgument.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_actionArgument
 
@@ -16,7 +17,6 @@ Examples:
 Author:
     Rommel
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(actionArgument);
 
 params ["_target", "_caller", "_id", "_arguments"];

diff --git a/addons/common/fnc_addBackpackCargo.sqf b/addons/common/fnc_addBackpackCargo.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_addBackpackCargo
 
@@ -28,7 +29,6 @@ Examples:
 Author:
     commy2
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(addBackpackCargo);
 
 params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]];

diff --git a/addons/common/fnc_addBinocularMagazine.sqf b/addons/common/fnc_addBinocularMagazine.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_addBinocularMagazine
 
@@ -23,7 +24,6 @@ Examples:
 Author:
     commy2
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(addBinocularMagazine);
 
 params [["_unit", objNull, [objNull]], ["_magazine", "", [""]], ["_ammo", nil, [0]]];

diff --git a/addons/common/fnc_addItem.sqf b/addons/common/fnc_addItem.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_addItem
 
@@ -23,7 +24,6 @@ Examples:
 Author:
 
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(addItem);
 
 params [["_unit", objNull, [objNull]], ["_item", "", [""]], ["_verify", false, [false]]];

diff --git a/addons/common/fnc_addItemCargo.sqf b/addons/common/fnc_addItemCargo.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_addItemCargo
 
@@ -28,7 +29,6 @@ Examples:
 Author:
     commy2
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(addItemCargo);
 
 params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]];

diff --git a/addons/common/fnc_addMagazine.sqf b/addons/common/fnc_addMagazine.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_addMagazine
 
@@ -24,7 +25,6 @@ Examples:
 Author:
 
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(addMagazine);
 
 params [["_unit", objNull, [objNull]], ["_item", "", [""]], ["_ammo", -1, [0]], ["_verify", false, [false]]];

diff --git a/addons/common/fnc_addMagazineCargo.sqf b/addons/common/fnc_addMagazineCargo.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_addMagazineCargo
 
@@ -28,7 +29,6 @@ Examples:
 Author:
 
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 SCRIPT(addMagazineCargo);
 
 params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]];

diff --git a/addons/common/fnc_addPerFrameHandler.sqf b/addons/common/fnc_addPerFrameHandler.sqf
@@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /* ----------------------------------------------------------------------------
 Function: CBA_fnc_addPerFrameHandler
 
@@ -25,7 +26,6 @@ Examples:
 Author:
     Nou & Jaynus, donated from ACRE project code for use by the community; commy2
 ---------------------------------------------------------------------------- */
-#include "script_component.hpp"
 
 params [["_function", {}, [{}]], ["_delay", 0, [0]], ["_args", []]];