Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix script errors reporting wrong line numbers #937

Merged
merged 34 commits into from
Jun 30, 2018
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion addons/common/fnc_actionArgument.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_actionArgument

Expand All @@ -16,7 +17,6 @@ Examples:
Author:
Rommel
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(actionArgument);

params ["_target", "_caller", "_id", "_arguments"];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_addBackpackCargo.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addBackpackCargo

Expand Down Expand Up @@ -28,7 +29,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(addBackpackCargo);

params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_addBinocularMagazine.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addBinocularMagazine

Expand All @@ -23,7 +24,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(addBinocularMagazine);

params [["_unit", objNull, [objNull]], ["_magazine", "", [""]], ["_ammo", nil, [0]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_addItem.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addItem

Expand All @@ -23,7 +24,6 @@ Examples:
Author:

---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(addItem);

params [["_unit", objNull, [objNull]], ["_item", "", [""]], ["_verify", false, [false]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_addItemCargo.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addItemCargo

Expand Down Expand Up @@ -28,7 +29,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(addItemCargo);

params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_addMagazine.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addMagazine

Expand All @@ -24,7 +25,6 @@ Examples:
Author:

---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(addMagazine);

params [["_unit", objNull, [objNull]], ["_item", "", [""]], ["_ammo", -1, [0]], ["_verify", false, [false]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_addMagazineCargo.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addMagazineCargo

Expand Down Expand Up @@ -28,7 +29,6 @@ Examples:
Author:

---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(addMagazineCargo);

params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_addPerFrameHandler.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addPerFrameHandler

Expand Down Expand Up @@ -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", []]];

Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_addWeapon.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addWeapon

Expand All @@ -23,7 +24,6 @@ Examples:
Author:

---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(addWeapon);

#define TYPE_RIFLE 1
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_addWeaponCargo.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_addWeaponCargo

Expand Down Expand Up @@ -28,7 +29,6 @@ Examples:
Author:
Sickboy
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(addWeaponCargo);

params [["_container", objNull, [objNull]], ["_item", "", [""]], ["_count", 1, [0]], ["_verify", false, [false]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_allNamespaces.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_allNamespaces

Expand All @@ -18,7 +19,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(allNamespaces);

nearestLocations [DUMMY_POSITION, ["CBA_NamespaceDummy"], 1] + (nearestObjects [ASLToAGL DUMMY_POSITION, [], 1] select {typeOf _x isEqualTo "CBA_NamespaceDummy"})
2 changes: 1 addition & 1 deletion addons/common/fnc_binocularMagazine.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_binocularMagazine

Expand All @@ -18,7 +19,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(binocularMagazine);

params [["_unit", objNull, [objNull]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_canUseWeapon.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_canUseWeapon

Expand All @@ -18,7 +19,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(canUseWeapon);

params [["_unit", objNull, [objNull]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_compileFinal.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_compileFinal

Expand All @@ -19,7 +20,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(compileFinal);

params [["_name", "", [""]], ["_function", {}, [{}]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_createNamespace.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_createNamespace

Expand All @@ -23,7 +24,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(createNamespace);

params [["_isGlobal", false]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_createPerFrameHandlerObject.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_createPerFrameHandlerObject

Expand Down Expand Up @@ -53,7 +54,6 @@ Examples:
Author:
Nou & Jaynus, donated from ACRE project code for use by the community; commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"

params [
["_function", {}, [{}]],
Expand Down
3 changes: 1 addition & 2 deletions addons/common/fnc_createTrigger.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_createTrigger

Expand Down Expand Up @@ -26,8 +27,6 @@ Examples:
Author:
Sickboy (sb_at_dev-heaven.net)
---------------------------------------------------------------------------- */

#include "script_component.hpp"
SCRIPT(createTrigger);

/*
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_currentMagazineIndex.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_currentMagazineIndex

Expand All @@ -14,7 +15,6 @@ Returns:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(currentMagazineIndex);

params [["_unit", objNull, [objNull]], ["_turret", nil, [[]]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_deleteEntity.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_deleteEntity

Expand All @@ -18,7 +19,6 @@ Returns:
Author:
Rommel
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(deleteEntity);

[_this] params [["_entity", objNull, [objNull, grpNull, locationNull, "", []]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_deleteNamespace.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_deleteNamespace

Expand All @@ -18,7 +19,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(deleteNamespace);

params [["_namespace", locationNull, [locationNull, objNull]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_deletePerFrameHandlerObject.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_deletePerFrameHandlerObject

Expand All @@ -18,7 +19,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"

params [["_logic", locationNull, [locationNull]]];

Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_directCall.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_directCall

Expand All @@ -20,7 +21,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"

params [["_CBA_code", {}, [{}]], ["_this", []]];

Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_dropItem.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_dropItem

Expand All @@ -22,7 +23,6 @@ Examples:
Author:
commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(dropItem);

params [["_unit", objNull, [objNull]], ["_item", "", [""]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_dropMagazine.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_dropMagazine

Expand All @@ -23,7 +24,6 @@ Examples:
Author:
?, commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(dropMagazine);

params [["_unit", objNull, [objNull]], ["_item", "", [""]], ["_ammo", -1, [0]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_dropWeapon.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_dropWeapon

Expand All @@ -22,7 +23,6 @@ Examples:
Author:
?, commy2
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(dropWeapon);

params [["_unit", objNull, [objNull]], ["_item", "", [""]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_execNextFrame.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_execNextFrame

Expand All @@ -19,7 +20,6 @@ Examples:
Author:
esteldunedain and PabstMirror, donated from ACE3
---------------------------------------------------------------------------- */
#include "script_component.hpp"

params [["_function", {}, [{}]], ["_args", []]];

Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_findEntity.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_findEntity

Expand All @@ -22,7 +23,6 @@ Returns:
Author:
Rommel
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(findEntity);

params [["_type", "", [objNull, ""]], ["_position", objNull], ["_radius", 50, [0]]];
Expand Down
2 changes: 1 addition & 1 deletion addons/common/fnc_getAlive.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_getAlive

Expand All @@ -18,7 +19,6 @@ Returns:
Author:
Rommel
---------------------------------------------------------------------------- */
#include "script_component.hpp"
SCRIPT(getAlive);

[_this] params [["_entities", [], [objNull, grpNull, []]]];
Expand Down
3 changes: 1 addition & 2 deletions addons/common/fnc_getAnimType.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_getAnimType

Expand All @@ -19,8 +20,6 @@ Examples:
Author:

---------------------------------------------------------------------------- */

#include "script_component.hpp"
SCRIPT(getAnimType);

private ["_anim", "_weapon", "_pos"];
Expand Down
3 changes: 1 addition & 2 deletions addons/common/fnc_getArg.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/* ----------------------------------------------------------------------------
Function: CBA_fnc_getArg

Expand All @@ -16,8 +17,6 @@ Examples:
Author:
Kronzky (www.kronzky.info)
---------------------------------------------------------------------------- */

#include "script_component.hpp"
SCRIPT(getArg);

private["_cLC", "_cUC", "_arg", "_list", "_a", "_v"];
Expand Down
Loading