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

* advanced_ballistics * advanced_fatigue * advanced_throwing * ai * aircraft * arsenal * atragmx * attach * backpacks * ballistics * captives * cargo * chemlights * common * concertina_wire * cookoff * dagr * disarming * disposable * dogtags * dragging * explosives * fastroping * fcs * finger * frag * gestures * gforces * goggles * grenades * gunbag * hearing * hitreactions * huntir * interact_menu * interaction * inventory * kestrel4500 * laser * laserpointer * logistics_uavbattery * logistics_wirecutter * magazinerepack * map * map_gestures * maptools * markers * medical * medical_ai * medical_blood * medical_menu * microdagr * minedetector * missileguidance * missionmodules * mk6mortar * modules * movement * nametags * nightvision * nlaw * optics * optionsmenu * overheating * overpressure * parachute * pylons * quickmount * rangecard * rearm * recoil * refuel * reload * reloadlaunchers * repair * respawn * safemode * sandbag * scopes * slideshow * spectator * spottingscope * switchunits * tacticalladder * tagging * trenches * tripod * ui * vector * vehiclelock * vehicles * viewdistance * weaponselect * weather * winddeflection * yardage450 * zeus * arsenal defines.hpp * optionals * DEBUG_MODE_FULL 1 * DEBUG_MODE_FULL 2 * Manual fixes * Add SQF Validator check for #include after block comment * explosives fnc_openTimerUI * fix uniqueItems
2024-08-30 18:23:18 +00:00 · 2018-09-17 21:19:29 +02:00
parent 803d497d8a
commit e2ac18a05d
1643 changed files with 1702 additions and 2094 deletions
--- a/addons/interact_menu/functions/fnc_addActionToClass.sqf
+++ b/addons/interact_menu/functions/fnc_addActionToClass.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: esteldunedain
 * Insert an ACE action to a class, under a certain path
@ -18,7 +19,6 @@
 *
 * Public: Yes
 */
-#include "script_component.hpp"

 if (!params [["_objectType", "", [""]], ["_typeNum", 0, [0]], ["_parentPath", [], [[]]], ["_action", [], [[]], 11]]) exitWith {
    ERROR("Bad Params");
--- a/addons/interact_menu/functions/fnc_addActionToObject.sqf
+++ b/addons/interact_menu/functions/fnc_addActionToObject.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: esteldunedain
 * Insert an ACE action to an object, under a certain config path
@ -17,7 +18,6 @@
 *
 * Public: Yes
 */
-#include "script_component.hpp"

 if (!params [["_object", objNull, [objNull]], ["_typeNum", 0, [0]], ["_parentPath", [], [[]]], ["_action", [], [[]], 11]]) exitWith {
    ERROR("Bad Params");
--- a/addons/interact_menu/functions/fnc_addActionToZeus.sqf
+++ b/addons/interact_menu/functions/fnc_addActionToZeus.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: PabstMirror
 * Insert an ACE action to zeus.
@ -15,7 +16,6 @@
 *
 * Public: Yes
 */
-#include "script_component.hpp"

 if (!params [["_parentPath", [], [[]]], ["_action", [], [[]], 11]]) exitWith {ERROR("Bad Params"); []};
 if ((_parentPath param [0, ""]) != "ACE_ZeusActions") exitWith {ERROR_1("Bad path %1 - should have ACE_ZeusActions as base", _parentPath); []};
--- a/addons/interact_menu/functions/fnc_addMainAction.sqf
+++ b/addons/interact_menu/functions/fnc_addMainAction.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: Jonpas, PabstMirror
 * Makes sure there is a ACE_MainActions on the object type
@ -14,7 +15,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_objectType", "_typeNum"];

--- a/addons/interact_menu/functions/fnc_collectActiveActionTree.sqf
+++ b/addons/interact_menu/functions/fnc_collectActiveActionTree.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: esteldunedain
 * Collect a entire tree of active actions
@ -16,7 +17,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_object", "_origAction", "_parentPath", "_distanceToBasePoint"];
 _origAction params ["_origActionData", "_origActionChildren"];
--- a/addons/interact_menu/functions/fnc_compileMenu.sqf
+++ b/addons/interact_menu/functions/fnc_compileMenu.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: NouberNou and esteldunedain
 * Compile the action menu from config for an object's class
@ -13,7 +14,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_target"];

--- a/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
+++ b/addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: NouberNou and esteldunedain
 * Compile the self action menu from config for an object's class
@ -13,7 +14,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_target"];

--- a/addons/interact_menu/functions/fnc_compileMenuZeus.sqf
+++ b/addons/interact_menu/functions/fnc_compileMenuZeus.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: SilentSpike
 * Compile the zeus action menu (only to be done once)
@ -13,7 +14,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 // Exit if the action menu is already compiled for zeus
 if !(isNil {missionNamespace getVariable [QGVAR(ZeusActions), nil]}) exitWith {};
--- a/addons/interact_menu/functions/fnc_createAction.sqf
+++ b/addons/interact_menu/functions/fnc_createAction.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: esteldunedain
 * Creates an isolated ACE action
@ -24,7 +25,6 @@
 *
 * Public: Yes
 */
-#include "script_component.hpp"

 // IGNORE_PRIVATE_WARNING(_actionName,_displayName,_icon,_statement,_condition,_insertChildren,_customParams,_position,_distance,_params,_modifierFunction);

--- a/addons/interact_menu/functions/fnc_createVehiclesActions.sqf
+++ b/addons/interact_menu/functions/fnc_createVehiclesActions.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: Dystopian
 * Creates child actions for vehicle list.
@ -16,7 +17,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_vehicles", "_statement", "_target"];

--- a/addons/interact_menu/functions/fnc_ctrlSetParsedTextCached.sqf
+++ b/addons/interact_menu/functions/fnc_ctrlSetParsedTextCached.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: commy2
 * Sets the controls structured text if it isn't already set.
@ -15,7 +16,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_ctrl", "_index", "_text"];

--- a/addons/interact_menu/functions/fnc_findActionNode.sqf
+++ b/addons/interact_menu/functions/fnc_findActionNode.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: esteldunedain
 * Return action point from path
@ -15,7 +16,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_actionTreeList", "_parentPath"];

--- a/addons/interact_menu/functions/fnc_handleEscapeMenu.sqf
+++ b/addons/interact_menu/functions/fnc_handleEscapeMenu.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: PabstMirror
 * Handle the escape key being pressed.
@ -13,7 +14,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 if (GVAR(openedMenuType) < 0) exitWith {};

--- a/addons/interact_menu/functions/fnc_isSubPath.sqf
+++ b/addons/interact_menu/functions/fnc_isSubPath.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: esteldunedain
 * Check if the first path is a subpath of the other
@ -14,7 +15,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_longPath", "_shortPath"];

--- a/addons/interact_menu/functions/fnc_keyDown.sqf
+++ b/addons/interact_menu/functions/fnc_keyDown.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: NouberNou and esteldunedain
 * Handle interactions key down
@ -13,7 +14,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_menuType"];

--- a/addons/interact_menu/functions/fnc_keyUp.sqf
+++ b/addons/interact_menu/functions/fnc_keyUp.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: NouberNou and esteldunedain
 * Handle interactions key up
@ -13,7 +14,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_menuType", "_calledByClicking"];

--- a/addons/interact_menu/functions/fnc_removeActionFromClass.sqf
+++ b/addons/interact_menu/functions/fnc_removeActionFromClass.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: esteldunedain
 * Removes an action from a class
@ -15,7 +16,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_objectType", "_typeNum", "_fullPath"];

--- a/addons/interact_menu/functions/fnc_removeActionFromObject.sqf
+++ b/addons/interact_menu/functions/fnc_removeActionFromObject.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: commy2, NouberNou and esteldunedain
 * Removes an action from an object
@ -15,7 +16,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_object", "_typeNum", "_fullPath"];

--- a/addons/interact_menu/functions/fnc_render.sqf
+++ b/addons/interact_menu/functions/fnc_render.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: NouberNou and esteldunedain
 * Render all available nearby interactions
@ -13,8 +14,6 @@
 *
 * Public: No
 */
-// #define ENABLE_PERFORMANCE_COUNTERS
-#include "script_component.hpp"

 BEGIN_COUNTER(fnc_render);

--- a/addons/interact_menu/functions/fnc_renderActionPoints.sqf
+++ b/addons/interact_menu/functions/fnc_renderActionPoints.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: NouberNou and esteldunedain
 * Render all action points
@ -13,7 +14,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 GVAR(currentOptions) = [];

--- a/addons/interact_menu/functions/fnc_renderBaseMenu.sqf
+++ b/addons/interact_menu/functions/fnc_renderBaseMenu.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: NouberNou and esteldunedain
 * Render the interaction menu for a base action
@ -15,7 +16,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 BEGIN_COUNTER(fnc_renderBaseMenu)

--- a/addons/interact_menu/functions/fnc_renderIcon.sqf
+++ b/addons/interact_menu/functions/fnc_renderIcon.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: NouberNou, esteldunedain, mharis001
 * Render a single interaction icon.
@ -16,7 +17,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"
 #define DEFAULT_ICON QUOTE(\z\ace\addons\interaction\ui\dot_ca.paa)

 params ["_text", "_icon", "_sPos", "_textSettings"];
--- a/addons/interact_menu/functions/fnc_renderMenu.sqf
+++ b/addons/interact_menu/functions/fnc_renderMenu.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: NouberNou and esteldunedain
 * Render an interaction menu and it's children recursively
@ -16,7 +17,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_parentPath", "_action", "_sPos", "_angles"];
 _action params ["_actionData", "_activeChildren", "_actionObject"];
--- a/addons/interact_menu/functions/fnc_renderSelector.sqf
+++ b/addons/interact_menu/functions/fnc_renderSelector.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: esteldunedain
 * Render a single interaction icon
@ -14,7 +15,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_sPos", "_icon"];

--- a/addons/interact_menu/functions/fnc_setupTextColors.sqf
+++ b/addons/interact_menu/functions/fnc_setupTextColors.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: PabstMirror
 * Builds color strings needed for displaying interaction text
@ -13,7 +14,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 //Mixes 2 colors (number arrays) and makes a color string "#AARRGGBB" for structured text
 private _mixColor = {
--- a/addons/interact_menu/functions/fnc_splitPath.sqf
+++ b/addons/interact_menu/functions/fnc_splitPath.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: esteldunedain
 * Take full path and split it between parent path and action name
@ -14,7 +15,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 private _parentPath = [];
 for [{private _i = 0},{_i < (count _this) - 1},{_i = _i + 1}] do {
--- a/addons/interact_menu/functions/fnc_userActions_addHouseActions.sqf
+++ b/addons/interact_menu/functions/fnc_userActions_addHouseActions.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: PabstMirror
 * Scans for nearby "Static" objects (buildings) and adds the UserActions to them.
@ -14,7 +15,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_interactionType"];

--- a/addons/interact_menu/functions/fnc_userActions_getHouseActions.sqf
+++ b/addons/interact_menu/functions/fnc_userActions_getHouseActions.sqf
@ -1,3 +1,4 @@
+#include "script_component.hpp"
 /*
 * Author: PabstMirror
 * Scans the buidling type for UserActions and Ladder mount points.
@ -13,7 +14,6 @@
 *
 * Public: No
 */
-#include "script_component.hpp"

 params ["_typeOfBuilding"];