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

Tools - Update SQF Validator and others from ACE3, More relative includes #1282

Merged
merged 3 commits into from
Sep 12, 2023
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion addons/sys_bf888s/functions/__PREP__.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"


PREP_MODULE(functions,preset_information);
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/functions/fnc_onChannelKnobPress.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Handles the event of turning the channel radio knob or changing the block. It essentially sets a new channel as active
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/functions/fnc_onVolumeKnobPress.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Handles the event of turning the volume radio knob.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/functions/fnc_preset_information.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Initialises and registers the default presets with the initial values of transmitting and receiving frequencies for each of the channels.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/functions/fnc_render.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Renders the radio when opened.
Expand Down
1 change: 0 additions & 1 deletion addons/sys_bf888s/functions/script_component.hpp

This file was deleted.

2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/__PREP__.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"

PREP_MODULE(radio,initializeRadio);

Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_closeGui.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Close radio GUI. Event raised by onUnload (BF888S_RadioDialog).
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getChannelData.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Returns all information regarding the parsed radio channel.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getChannelDataInternal.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getChannelDescription.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Returns the description of the currently selected channel. Used in the transmission hint.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getCurrentChannel.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Returns the current channel of the active radio.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getCurrentChannelData.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Gets the channel data. It consists of mode, transmitting and receiving frequencies and power
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getCurrentChannelInternal.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Returns the unique identity of the current channel.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getExternalAudioPosition.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
*
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getOnOffState.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getSpatial.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Returns the spatial configuration of the radio.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getState.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Function to obtain the content of the radio data hash for the event data key
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getStates.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Does nothing
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_getVolume.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Returns the current radio volume.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_handleBeginTransmission.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Function called when starting a transmission. For the BF-888S it does nothing.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_handleEndTransmission.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Function called when the radio transmission is ended. It manages the radio behaviour if there
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Handles multiple transmissions in the "singleChannel" mode. In this mode, the following parameters
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_handlePTTDown.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Function called when PTT key is pressed. The most important aspect is setting the PTTDown flag
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_handlePTTUp.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Function called when PTT key is released. The most important aspect is setting the PTTDown flag
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_handleSignalData.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Allows for further processing of signal data.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_initializeRadio.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Initialises a radio by givint it a radio ID. This only happens once and the default
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_isExternalAudio.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_openGui.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Opens the GUI of the radio. This is trigered by either double-click in the inventory,
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_setChannelData.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Sets the channel data. On a BF-888S this cannot be changed.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_setCurrentChannel.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Sets the desired channel as current.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_setOnOffState.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Sets the radio on (1) or off (0).
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_setSpatial.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Sets the spatial configuration of the radio. Possible values are -1 (left), 0 (center) and 1 (right).
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_setState.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Sets the a key pair content into the radioData hash.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_bf888s/radio/fnc_setVolume.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Sets the volume of the current radio.
Expand Down
1 change: 0 additions & 1 deletion addons/sys_bf888s/radio/script_component.hpp

This file was deleted.

2 changes: 1 addition & 1 deletion addons/sys_components/fnc_toggleAntennaDir.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Toggles the player's antenna direction (alignment).
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

private _dir = acre_player getVariable [QEGVAR(sys_core,antennaDirUp), false];

Expand Down
2 changes: 1 addition & 1 deletion addons/sys_core/fnc_hasItem.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Checks if a unit has a specific item.
Expand All @@ -14,7 +15,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params [["_unit", objNull], ["_item", ""]];

Expand Down
2 changes: 1 addition & 1 deletion addons/sys_core/fnc_ignoreAntennaDirection.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: ACRE2Team
* Use this to enable/disable the ignoring of antenna direction in the radio signal simulation.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

if (!hasInterface) exitWith {false};

Expand Down
2 changes: 1 addition & 1 deletion addons/sys_core/fnc_uniqueItems.sqf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#include "script_component.hpp"
/*
* Author: mharis001, courtesy of ACE3 project.
* Returns list of unique items in a unit's inventory. Items are cached if unit is acre_player.
Expand All @@ -13,7 +14,6 @@
*
* Public: No
*/
#include "script_component.hpp"

params ["_unit"];

Expand Down
9 changes: 9 additions & 0 deletions addons/sys_intercom/script_component.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,12 @@
#define MINIMUM_INTERCOM_ACCENT_VOLUME 0.1

#define MAIN_DISPLAY (findDisplay 31337)

// VIC3
#define VIC3FFCS_WORK_KNOB_POSITIONS 6
#define VIC3FFCS_MONITOR_KNOB_POSITIONS 7

#define INTERCOM_STATIONSTATUS_INTERCOMKNOB "intercomKnob"
#define INTERCOM_STATIONSTATUS_MONITORKNOB "monitorKnob"
#define INTERCOM_STATIONSTATUS_VOLUMEKNOB "volumeKnob"
#define INTERCOM_STATIONSTATUS_WORKKNOB "workKnob"
2 changes: 1 addition & 1 deletion addons/sys_intercom/vic3/__PREP__.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"

PREP_MODULE(vic3,vic3ffcsConfig);
PREP_MODULE(vic3,vic3ffcsOnIntercomKnobPress);
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_intercom/vic3/fnc_vic3ffcsConfig.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Configures the VIC-3 FFCS station.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Handles turning the intercom knob.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Handles turning the monitor knob.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_intercom/vic3/fnc_vic3ffcsOnVolumeKnobPress.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Handles turning the volume knob.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_intercom/vic3/fnc_vic3ffcsOnWorkKnobPress.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Handles turning the work knob.
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_intercom/vic3/fnc_vic3ffcsRender.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* Renders the VIC3 FFCS when opened.
Expand Down
9 changes: 0 additions & 9 deletions addons/sys_intercom/vic3/script_component.hpp

This file was deleted.

2 changes: 1 addition & 1 deletion addons/sys_prc117f/farris_menus/Loading.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_prc117f/farris_menus/MODE.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_prc117f/farris_menus/Main.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_prc117f/farris_menus/OPT.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_prc117f/farris_menus/PGM.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_prc117f/farris_menus/SQ.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_prc117f/farris_menus/__PREP__.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"

MENU_DEFINITION(farris_menus,Loading);
MENU_DEFINITION(farris_menus,Main);
Expand Down
1 change: 0 additions & 1 deletion addons/sys_prc117f/farris_menus/script_component.hpp

This file was deleted.

2 changes: 1 addition & 1 deletion addons/sys_prc117f/menus/__PREP__.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"

PREP_MODULE(menus,onButtonPress);
PREP_MODULE(menus,defaultButtonPress);
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_prc117f/menus/fnc_callButtonFunctor.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_prc117f/menus/fnc_callCompleteFunctor.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_prc117f/menus/fnc_callEntryFunctor.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
2 changes: 1 addition & 1 deletion addons/sys_prc117f/menus/fnc_callRenderFunctor.sqf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "script_component.hpp"
#include "..\script_component.hpp"
/*
* Author: ACRE2Team
* SHORT DESCRIPTION
Expand Down
Loading