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 #6407

Merged
merged 109 commits into from
Sep 17, 2018
Merged
Show file tree
Hide file tree
Changes from 107 commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
feb9729
advanced_ballistics
dedmen Jun 25, 2018
d72aa09
advanced_fatigue
dedmen Jun 25, 2018
9dd3b73
advanced_throwing
dedmen Jun 25, 2018
f954e58
ai
dedmen Jun 25, 2018
b25c0ba
aircraft
dedmen Jun 25, 2018
131d0ba
arsenal
dedmen Jun 25, 2018
f11c31b
atragmx
dedmen Jun 25, 2018
3f61fd5
attach
dedmen Jun 25, 2018
de18ca1
backpacks
dedmen Jun 25, 2018
8e8e25e
ballistics
dedmen Jun 25, 2018
d46cfa9
captives
dedmen Jun 25, 2018
7bc1871
cargo
dedmen Jun 25, 2018
61a34e8
chemlights
dedmen Jun 25, 2018
6daf8b0
common
dedmen Jun 25, 2018
807cecc
concertina_wire
dedmen Jun 25, 2018
37b1bda
cookoff
dedmen Jun 25, 2018
06a1bca
dagr
dedmen Jun 25, 2018
2d54456
disarming
dedmen Jun 25, 2018
45de2a6
disposable
dedmen Jun 25, 2018
35d4310
dogtags
dedmen Jun 25, 2018
a0a649b
dragging
dedmen Jun 25, 2018
5a01272
explosives
dedmen Jun 25, 2018
44ee626
fastroping
dedmen Jun 25, 2018
f9d6684
fcs
dedmen Jun 25, 2018
7e758b1
finger
dedmen Jun 25, 2018
08636d3
frag
dedmen Jun 25, 2018
6d39df8
gestures
dedmen Jun 25, 2018
7f2a0fc
gforces
dedmen Jun 25, 2018
54dbafa
goggles
dedmen Jun 25, 2018
0a027fd
grenades
dedmen Jun 25, 2018
9bd5ab2
gunbag
dedmen Jun 25, 2018
6ec3505
hearing
dedmen Jun 25, 2018
8a9e193
hitreactions
dedmen Jun 25, 2018
e4bd63e
huntir
dedmen Jun 25, 2018
9ba50f5
interact_menu
dedmen Jun 25, 2018
71225fe
interaction
dedmen Jun 25, 2018
360563e
inventory
dedmen Jun 25, 2018
5cab0ef
kestrel4500
dedmen Jun 25, 2018
f4268ce
laser
dedmen Jun 25, 2018
d484ec5
laserpointer
dedmen Jun 25, 2018
26688ab
logistics_uavbattery
dedmen Jun 25, 2018
87696ae
logistics_wirecutter
dedmen Jun 25, 2018
11da961
magazinerepack
dedmen Jun 25, 2018
a0fee98
map
dedmen Jun 25, 2018
6af21a6
map_gestures
dedmen Jun 25, 2018
ba71c1d
maptools
dedmen Jun 25, 2018
284457e
markers
dedmen Jun 25, 2018
47f1867
medical
dedmen Jun 25, 2018
a0c9e4d
medical_ai
dedmen Jun 25, 2018
e1af1fe
medical_blood
dedmen Jun 25, 2018
f1d4678
medical_menu
dedmen Jun 25, 2018
3fd8766
microdagr
dedmen Jun 25, 2018
f1aa143
minedetector
dedmen Jun 25, 2018
7741e70
missileguidance
dedmen Jun 25, 2018
b3fcb10
missionmodules
dedmen Jun 25, 2018
931dd16
mk6mortar
dedmen Jun 25, 2018
2974f98
modules
dedmen Jun 25, 2018
bdc1f4b
movement
dedmen Jun 25, 2018
f0648fc
nametags
dedmen Jun 25, 2018
6506929
nightvision
dedmen Jun 25, 2018
a7e65fd
nlaw
dedmen Jun 25, 2018
7f60e85
optics
dedmen Jun 25, 2018
0e52b72
optionsmenu
dedmen Jun 25, 2018
719329b
overheating
dedmen Jun 25, 2018
1a2360c
overpressure
dedmen Jun 25, 2018
ecd7e50
parachute
dedmen Jun 25, 2018
83112a3
pylons
dedmen Jun 25, 2018
a7d3abc
quickmount
dedmen Jun 25, 2018
ea34305
rangecard
dedmen Jun 25, 2018
f6a0a5c
rearm
dedmen Jun 25, 2018
7f84941
recoil
dedmen Jun 25, 2018
8c35281
refuel
dedmen Jun 25, 2018
53623b6
reload
dedmen Jun 25, 2018
20eab3b
reloadlaunchers
dedmen Jun 25, 2018
8948f3f
repair
dedmen Jun 25, 2018
24500a2
respawn
dedmen Jun 25, 2018
7955203
safemode
dedmen Jun 25, 2018
8f7b65a
sandbag
dedmen Jun 25, 2018
39825ea
scopes
dedmen Jun 25, 2018
843a4e0
slideshow
dedmen Jun 25, 2018
4c2e54a
spectator
dedmen Jun 25, 2018
100e3ba
spottingscope
dedmen Jun 25, 2018
7b33afe
switchunits
dedmen Jun 25, 2018
147e1a4
tacticalladder
dedmen Jun 25, 2018
10bedaf
tagging
dedmen Jun 25, 2018
0fb7adb
trenches
dedmen Jun 25, 2018
240b280
tripod
dedmen Jun 25, 2018
25b609d
ui
dedmen Jun 25, 2018
982c0ee
vector
dedmen Jun 25, 2018
ccf43f4
vehiclelock
dedmen Jun 25, 2018
0c76f70
vehicles
dedmen Jun 25, 2018
d6b74ec
viewdistance
dedmen Jun 25, 2018
4b81e2e
weaponselect
dedmen Jun 25, 2018
9c70e59
weather
dedmen Jun 25, 2018
79d139b
winddeflection
dedmen Jun 25, 2018
039ccfc
yardage450
dedmen Jun 25, 2018
4bf6db3
zeus
dedmen Jun 25, 2018
37ec113
arsenal defines.hpp
dedmen Jun 25, 2018
7632835
optionals
dedmen Jun 25, 2018
8e8e521
DEBUG_MODE_FULL 1
dedmen Jun 25, 2018
f62942b
DEBUG_MODE_FULL 2
dedmen Jun 25, 2018
d5d2aa8
Manual fixes
dedmen Jun 29, 2018
b4ca2e7
Merge remote-tracking branch 'acemod/master' into moveIncludesBeforeH…
dedmen Jul 19, 2018
5f7fc99
Add SQF Validator check for #include after block comment
dedmen Jul 19, 2018
ad750a2
Merge remote-tracking branch 'acemod/master' into moveIncludesBeforeH…
dedmen Jul 30, 2018
a8095d6
Merge remote-tracking branch 'acemod/master' into moveIncludesBeforeH…
dedmen Sep 13, 2018
05d9839
explosives fnc_openTimerUI
dedmen Sep 13, 2018
c4697d1
Merge branch 'master' into moveIncludesBeforeHeader
PabstMirror Sep 17, 2018
f3ac1c8
fix uniqueItems
PabstMirror Sep 17, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Ruthberg
*
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_muzzleVelocityShiftTable", "_temperature"];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Ruthberg
*
Expand All @@ -18,7 +19,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_ballisticCoefficient", "_temperature"/*in C*/, "_pressure"/*in hPa*/, "_relativeHumidity"/*as ratio 0-1*/, "_atmosphereModel"/*"ICAO" or "ASM"*/];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Ruthberg, MikeMatrix, joko // Jonas
*
Expand All @@ -17,7 +18,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_barrelLength", "_muzzleVelocityTable", "_barrelLengthTable", "_muzzleVelocity"];
TRACE_4("params",_barrelLength,_muzzleVelocityTable,_barrelLengthTable,_muzzleVelocity);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Ruthberg
*
Expand All @@ -16,7 +17,6 @@
*
* Public: No
*/
#include "script_component.hpp"

// Source: GNU Exterior Ballistics

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Ruthberg
*
Expand All @@ -20,7 +21,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_caliber", "_bulletLength", "_bulletMass", "_barrelTwist", "_muzzleVelocity", "_temperature", "_barometricPressure"];

Expand Down
4 changes: 2 additions & 2 deletions addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#define DEBUG_MODE_FULL
#include "script_component.hpp"
/*
* Author: esteldunedain
*
Expand All @@ -15,8 +17,6 @@
*
* Public: No
*/
#define DEBUG_MODE_FULL
#include "script_component.hpp"

private _diagnoseStartTime = diag_tickTime;
#ifdef DEBUG_INIT_SPEEDS
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Ruthberg
*
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

#define __dsp (uiNamespace getVariable "RscProtractor")
#define __ctrl1 (__dsp displayCtrl 132950)
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Glowbal, Ruthberg, joko // Jonas
* Handle the PFH for Bullets
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

{
_x params ["_bullet","_caliber","_bulletTraceVisible","_index"];
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_ballistics/functions/fnc_handleFired.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Glowbal, Ruthberg
*
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

//IGNORE_PRIVATE_WARNING ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile", "_vehicle", "_gunner", "_turret"];
TRACE_10("firedEH:",_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile, _vehicle, _gunner, _turret);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Glowbal, Ruthberg
* Module for adjusting the advanced ballistics settings
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_logic","_units", "_activated"];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Ruthberg
* Initializes the advanced ballistics dll extension with terrain data
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

if (!hasInterface) exitWith {};
if (!GVAR(enabled)) exitWith {};
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Ruthberg
*
Expand Down Expand Up @@ -25,7 +26,6 @@
*
* Public: No
*/
#include "script_component.hpp"

TRACE_1("Reading Ammo Config",_this);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Ruthberg
*
Expand All @@ -16,7 +17,6 @@
*
* Public: No
*/
#include "script_component.hpp"

private _weaponConfig = (configFile >> "CfgWeapons" >> _this);

Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_fatigue/functions/fnc_addDutyFactor.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: BaerMitUmlaut
* Adds a duty factor.
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"
params [["_id", "", [""]], ["_factor", 1, [0, {}]]];
if (_id == "" || {_factor isEqualTo 1}) exitWith {};

Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_fatigue/functions/fnc_createStaminaBar.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: BaerMitUmlaut
* Creates the stamina bar.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"
params ["_display"];

private _staminaBar = _display ctrlCreate [QGVAR(StaminaBarContainer), -1];
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_fatigue/functions/fnc_getAnimDuty.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: BaerMitUmlaut
* Calculates the duty of the current animation.
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"
params ["_unit", "_animName"];

private _duty = 1;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: BaerMitUmlaut
* Calculates the current metabolic costs for a unit.
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"
params ["_unit", "_velocity"];

private _gearMass = ((_unit getVariable [QEGVAR(movement,totalLoad), loadAbs _unit]) / 22.046) * GVAR(loadFactor);
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_fatigue/functions/fnc_handleEffects.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: BaerMitUmlaut
* Handles any audible, visual and physical effects of fatigue.
Expand All @@ -16,7 +17,6 @@
*
* Public: No
*/
#include "script_component.hpp"
params ["_unit", "_fatigue", "_speed", "_overexhausted"];

#ifdef DEBUG_MODE_FULL
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: BaerMitUmlaut
* Handles switching units (once on init and afterwards via Zeus).
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"
params ["_newUnit", "_oldUnit"];
TRACE_2("unit changed",_newUnit,_oldUnit);

Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_fatigue/functions/fnc_handleStaminaBar.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: BaerMitUmlaut
* Handles visual changes of the stamina bar.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"
params ["_stamina"];

private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_fatigue/functions/fnc_mainLoop.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: BaerMitUmlaut
* Main looping function that updates fatigue values.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"
if (!alive ACE_player) exitWith { // Dead people don't breath, Will also handle null (Map intros)
[FUNC(mainLoop), [], 1] call CBA_fnc_waitAndExecute;
private _staminaBarContainer = uiNamespace getVariable [QGVAR(staminaBarContainer), controlNull];
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_fatigue/functions/fnc_moduleSettings.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: BaerMitUmlaut
* Initializes the module settings.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"
params ["_logic"];

[_logic, QGVAR(enabled), "Enabled"] call EFUNC(common,readSettingFromModule);
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_fatigue/functions/fnc_removeDutyFactor.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: BaerMitUmlaut
* Removes a duty factor.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"
params [["_id", "", [""]]];

GVAR(dutyList) params ["_idList", "_factorList"];
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_throwing/functions/fnc_canPrepare.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Checks if a throwable can be prepared.
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_unit", ["_ignoreLastThrownTime", false]];

Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_throwing/functions/fnc_canThrow.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Checks if a throwable can be thrown.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_unit"];

Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_throwing/functions/fnc_drawArc.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Zapat, Dslyecxi, Jonpas
* Draws throw arc.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

// Disable drawing when intersecting with the vehicle
if !([ACE_player] call FUNC(canThrow)) exitWith {
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_throwing/functions/fnc_drawThrowable.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Dslyecxi, Jonpas, SilentSpike
* Handles drawing the currently selected or cooked throwable.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

if (dialog || {!(ACE_player getVariable [QGVAR(inHand), false])} || {!([ACE_player, true] call FUNC(canPrepare))}) exitWith {
[ACE_player, "In dialog or no throwable in hand or cannot prepare throwable"] call FUNC(exitThrowMode);
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_throwing/functions/fnc_exitThrowMode.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Dslyecxi, Jonpas
* Exits throw mode.
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_unit", "_reason"];
TRACE_2("params",_unit,_reason);
Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_throwing/functions/fnc_getMuzzle.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: PabstMirror
* Retrieve muzzle name from config.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_magazineClassname"];

Expand Down
2 changes: 1 addition & 1 deletion addons/advanced_throwing/functions/fnc_moduleInit.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Initializes the Advanced Throwing module.
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_logic", "_units", "_activated"];

Expand Down
Loading