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 error line numbers being wrong #367

Merged
merged 1 commit into from
Oct 4, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/air_security/functions/fnc_canSecure.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Check if the crew of the vehicle can be Secured.
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_vehicle", "_unit"];

Expand Down
2 changes: 1 addition & 1 deletion addons/air_security/functions/fnc_canUnsecure.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Check if the crew of the vehicle can be Unsecured.
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_vehicle", "_unit"];

Expand Down
2 changes: 1 addition & 1 deletion addons/air_security/functions/fnc_setSecurity.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: DaC, Jonpas
* Toggles vehicle crew security.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_vehicle"];

Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_endMissionError.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Ends mission with error message on client.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_errorMessage"];

Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_handleDisconnect.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Handles save and corpse removal on disconnect.
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_unit", "", "_uid"];
TRACE_1("Handle Disconnect",_this);
Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_handleKilled.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Handles killed event (mark in backend for fresh inventory).
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_player", "_killer"];
TRACE_1("Handle Killed",_this);
Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_handleRespawn.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Handles respawn event (mark in backend for fresh inventory).
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_player", "_corpse"];
TRACE_1("Handle Respawn",_this);
Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_invokeJavaMethod.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Invokes Java code through JNI extension with XML marshalling and returns the return value from extension.
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_method"];

Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_lockerAction.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Parses locker action through extension.
Expand All @@ -17,7 +18,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_player", "_type", "_container", "_itemClass", "_quantity"];

Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_playerLoadClient.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Loads player using ApolloClient extension.
Expand All @@ -15,7 +16,6 @@
* Public: No
*/
//#define DEBUG_MODE_FULL
#include "script_component.hpp"

params ["_player", "_loadType"];

Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_playerSaveClient.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Handles loadout change and periodic saves. Requests a save of the player after a delay.
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_player", "", ["_periodic", false]];
TRACE_2("Player Save Client",_player,_periodic);
Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_playerSingletonSave.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Saves a player object and necessary variables.
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_player", "_uid", "_type"];

Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_vehicleLoad.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Loads vehicles.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

private _retrieveVehicles = ["retrieveAllVehicles"] call FUNC(invokeJavaMethod);

Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_vehicleSaveServer.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Saves vehicles.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

// Make safe copy in case of new vehicles during this save round
private _vehList = +GVAR(vehiclesList);
Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_vehicleSingletonLoad.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Loads a single vehicle.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_vehicleID"];

Expand Down
2 changes: 1 addition & 1 deletion addons/apollo/functions/fnc_vehicleSingletonSave.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Saves a single vehicle.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_vehicleObject"];

Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_addItems.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Adds items to vanilla Armory system.
Expand All @@ -19,7 +20,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

params [
["_object", objNull, [objNull]],
Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_canAddArmory.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Checks if armory can be added to the object (object has inventory).
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_object"];

Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_canOpenArmory.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Checks if armory can be opened (is not in use by someone else).
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_object"];

Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_closeArmory.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Close Armory and clean up.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

// Allow others to use the object's Armory
private _object = ACE_player getVariable [QGVAR(object), objNull];
Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_dialogControl.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Overall menu manipulation.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_requestedMenu"];

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Sets up amount selection dropdown.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

private _quantity = CTRL(NLIST) lnbData [lnbCurSelRow NLIST, 2];
TRACE_1("Amount of selected item",_quantity);
Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_dialogControl_back.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Goes back to menu or exits Armory.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_type"];

Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_dialogControl_list.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Sets up requested list and dropdown.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_selectedCategory"];
GVAR(selectedCategory) = _selectedCategory; // For FUNC(dialogControl_takestash)
Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_dialogControl_main.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Sets up main menu.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_show"];

Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_dialogControl_populateList.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Populates lists.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_armoryData"];

Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_dialogControl_takestash.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Shows Take/Stash buttons.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

// Hide take/stash if quantity of dropdown amount selection is not set
if (lbText [DROPDOWNAMOUNT, lbCurSel CTRL(DROPDOWNAMOUNT)] == "") exitWith {
Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_extractSubCategories.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Extracts sub-categories from Armory Data.
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_armoryData", "_compatible"];

Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_getBoxContents.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: Jonpas
* Returns contents of a box.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

private _object = ACE_player getVariable [QGVAR(object), objNull];

Expand Down
2 changes: 1 addition & 1 deletion addons/armory/functions/fnc_getDataChronos.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: DaC, Jonpas
* Gets data from Apollo Client / Athena (Chronos).
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_selectedCategory"];

Expand Down
Loading