Skip to content

Commit

Permalink
Move script_component.hpp include to top - Fix error line numbers bei…
Browse files Browse the repository at this point in the history
…ng wrong (#595)
  • Loading branch information
jonpas authored Oct 4, 2018
1 parent 3f22e8c commit c748d10
Show file tree
Hide file tree
Showing 780 changed files with 787 additions and 787 deletions.
2 changes: 1 addition & 1 deletion addons/ace_interact/fnc_actionSetMTT.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_target", "_player", "_params", "_desiredIdx"];
_params params ["_radio", "", "_pttAssign", ""];
Expand Down
2 changes: 1 addition & 1 deletion addons/ace_interact/fnc_generateConnectorActions.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_target","","_params"];
_params params ["_parentComponent","_connectorIndex","_connectorType","_parentType",["_connectedType",-1],["_childDisplayName",""]];
Expand Down
2 changes: 1 addition & 1 deletion addons/ace_interact/fnc_generateConnectorList.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_target","","_params"];
_params params ["_radio","_connectorIndex"];
Expand Down
2 changes: 1 addition & 1 deletion addons/ace_interact/fnc_generateConnectors.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

if (!GVAR(connectorsEnabled)) exitWith {};

Expand Down
2 changes: 1 addition & 1 deletion addons/ace_interact/fnc_generateRxTxChildrenActions.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Generates actions for controlling the spatial set-up of a radio
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_target", "", "_params"];
_params params ["_radioID", "", "", "_functionality"];
Expand Down
2 changes: 1 addition & 1 deletion addons/ace_interact/fnc_generateSpatialChildrenActions.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Generates actions for controlling the spatial set-up of a radio
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_target", "", "_params"];
_params params ["_radioID", "", "", "_spatial"];
Expand Down
2 changes: 1 addition & 1 deletion addons/ace_interact/fnc_radioChildrenActions.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Generates a list of actions for using a radio in the player's inventory or externally used radios
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_target","","_params"];
_params params ["_radio", "_active", "_pttAssign"];
Expand Down
2 changes: 1 addition & 1 deletion addons/ace_interact/fnc_radioListChildrenActions.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_target"];

Expand Down
2 changes: 1 addition & 1 deletion addons/ace_interact/fnc_radioPTTChildrenActions.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_target", "", "_params"];
_params params ["_radio", "", "_pttAssign"];
Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_addDisplayPassthroughKeys.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Adds key handling compatibility to a custom display, which otherwise does not pass through CBA keybinds.
Expand All @@ -14,7 +15,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

if (!hasInterface) exitWith {};

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_addRackToVehicle.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Initialises all racks in the vehicle. Must be executed in the server. If no condition is specified,
Expand Down Expand Up @@ -27,7 +28,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

params [["_vehicle", objNull], "_rackConfiguration", ["_forceInitialisation", false], ["_condition", {}]];

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_areVehicleRacksInitialized.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Checks whether the vehicle racks have been initialized for the given vehicle.
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

params ["_vehicle"];

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_babelAddLanguageType.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Creates a new language to be used by the babel system.
Expand All @@ -14,7 +15,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

// Babel is not maintained on non-clients.
if (!hasInterface) exitWith {};
Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_babelGetLanguageId.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Gets the babel language key from the display name.
Expand All @@ -14,7 +15,6 @@
* Public: Yes
*/

#include "script_component.hpp"

params ["_languageKey"];

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_babelGetLanguageName.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Gets the babel language display name from the language ID.
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

params ["_languageKey"];

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_babelGetSpeakingLanguageId.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Gets the ID of the language which is actively being spoken (set with babelSetSpeakingLanguage).
Expand All @@ -13,6 +14,5 @@
*
* Public: Yes
*/
#include "script_component.hpp"

[] call EFUNC(sys_core,getSpeakingLanguageId);
2 changes: 1 addition & 1 deletion addons/api/fnc_babelSetSpeakingLanguage.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Sets the language the player will speak in.
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

params ["_languageKey"];

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_babelSetSpokenLanguages.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Sets the languages that the local player can speak.
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

private _list = _this;

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_babelSetupMission.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Provides functionality to allow for easy setup of side-specific languages.
Expand All @@ -17,7 +18,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

// Variables are provided as
// [ [side, languages], [side, languages] ] call acre_api_fnc_babelSetupMission;
Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_basicMissionSetup.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* For use by the ACRE API basicMissionSetup module.
Expand All @@ -15,7 +16,6 @@
*
* Public: No
*/
#include "script_component.hpp"

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

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_copyPreset.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Copies all parameters of the source preset to a new destination preset name.
Expand All @@ -15,7 +16,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

params ["_radioClass", "_srcPresetName", "_dstPresetName"];

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_getAllRadios.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Returns all radios defined in CfgAcreRadios. Caches result for future calls.
Expand All @@ -14,7 +15,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

// Return cached if already ran
if (!isNil QGVAR(allRadios)) exitWith {
Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_getBaseRadio.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Takes an actual unique radio ID, and returns its actual base radio type
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

params ["_radioId"];

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_getCurrentRadio.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Returns the unique radio ID of the currently active radio for the local player object.
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

if (isNil "ACRE_ACTIVE_RADIO") exitWith { "" };
ACRE_ACTIVE_RADIO
2 changes: 1 addition & 1 deletion addons/api/fnc_getCurrentRadioChannelNumber.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Returns the channel number that the currently active radio is on.
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

private _radioId = [] call FUNC(getCurrentRadio);
if (_radioId == "") exitWith { -1 };
Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_getCurrentRadioList.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Retrieves the array of current unique radio IDs that are on the local player.
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

private _ret = [] call EFUNC(sys_data,getPlayerRadioList);

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_getDefaultChannels.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Gets the preset data for a given radio base class.
Expand All @@ -13,7 +14,6 @@
*
* Deprecated
*/
#include "script_component.hpp"

ACRE_DEPRECATED(QFUNC(getDefaultChannels),"2.5.0",QFUNC(getPresetData));

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_getDisplayName.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Gets the display name for a radio ID.
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

params ["_radioId"];

Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_getGlobalVolume.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Gets the current global output volume for all ACRE voices and radios.
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

if (isNil QEGVAR(sys_core,globalVolume)) then {
nil
Expand Down
2 changes: 1 addition & 1 deletion addons/api/fnc_getMountedRackRadio.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Gets the mounted rack radio.
Expand All @@ -13,7 +14,6 @@
*
* Public: Yes
*/
#include "script_component.hpp"

params [["_rackId", ""], ["_returnBaseClass", false]];

Expand Down
Loading

0 comments on commit c748d10

Please sign in to comment.