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

Conform function headers to coding guidelines #5255

Merged
merged 3 commits into from
Jun 8, 2017
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
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
* Return Value:
* muzzle velocity shift - m/s <NUMBER>
*
* Example:
* [[], 5] call ace_advanced_ballistics_fnc_calcilateAmmoTemperatureVelocityShift
*
* Public: No
*/
#include "script_component.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
* Return Value:
* corrected ballistic coefficient <NUMBER>
*
* Example:
* [2, 5, 5, 0.5, "ASM"] call ace_advanced_ballistics_fnc_calculateAtmosphericCorrection
*
* Public: No
*/
#include "script_component.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,17 @@
* Calculates the muzzle velocity shift caused by different barrel lengths
*
* Arguments:
* 0: barrel length - mm
* 0: barrel length - mm <NUMBER>
* 1: muzzle velocity lookup table - m/s <ARRAY>
* 2: barrel length lookup table - mm <ARRAY>
* 3: muzzle velocity - m/s <NUMBER>
*
* Return Value:
* muzzle velocity shift - m/s <NUMBER>
*
* Example:
* [5, [0,5], [0,5], 5] call ace_advanced_ballistics_fnc_calculateBarrelLengthVelocityShift
*
* Public: No
*/
#include "script_component.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
* Return Value:
* retardation - m/(s^2) <NUMBER>
*
* Example:
* [5, 20, 10] call ace_advanced_ballistics_fnc_calculateRetardation
*
* Public: No
*/
#include "script_component.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
* Return Value:
* stability factor <NUMBER>
*
* Example:
* [1, 2, 3, 4, 5, 6, 7] call ace_advanced_ballistics_fnc_calculateStabilityFactor
*
* Public: No
*/
#include "script_component.hpp"
Expand Down
3 changes: 3 additions & 0 deletions addons/advanced_ballistics/functions/fnc_diagnoseWeapons.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
* Return Value:
* None
*
* Example:
* [] call ace_advanced_ballistics_fnc_diagnoseWeapons
*
* Public: No
*/
#define DEBUG_MODE_FULL
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
* Return Value:
* None
*
* Example:
* [] call ace_advanced_ballistics_fnc_displayProtractor
*
* Public: No
*/
#include "script_component.hpp"
Expand Down
3 changes: 3 additions & 0 deletions addons/advanced_ballistics/functions/fnc_handleFirePFH.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
* Return Value:
* None
*
* Example:
* [] call ace_advanced_ballistics_fnc_handleFirePFH
*
* Public: No
*/
#include "script_component.hpp"
Expand Down
3 changes: 3 additions & 0 deletions addons/advanced_ballistics/functions/fnc_handleFired.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
* Return Value:
* None
*
* Example:
* [] call ace_advanced_ballistics_fnc_handleFired
*
* Public: No
*/
#include "script_component.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
* Return Value:
* None
*
* Example:
* [LOGIC, [bob, kevin], true] call ace_advanced_ballistics_fnc_initModuleSettings
*
* Public: No
*/
#include "script_component.hpp"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
* Return Value:
* None
*
* Example:
* [] call ace_advanced_ballistics_fnc_initializeTerrainExtension
*
* Public: No
*/
#include "script_component.hpp"
Expand Down
27 changes: 15 additions & 12 deletions addons/advanced_ballistics/functions/fnc_readAmmoDataFromConfig.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,21 @@
* ammo - classname <STRING>
*
* Return Value:
* 0: _airFriction
* 1: _caliber
* 2: _bulletLength
* 3: _bulletMass
* 4: _transonicStabilityCoef
* 5: _dragModel
* 6: _ballisticCoefficients
* 7: _velocityBoundaries
* 8: _atmosphereModel
* 9: _ammoTempMuzzleVelocityShifts
* 10: _muzzleVelocityTable
* 11: _barrelLengthTable
* 0: _airFriction <NUMBER>
* 1: _caliber <NUMBER>
* 2: _bulletLength <NUMBER>
* 3: _bulletMass <NUMBER>
* 4: _transonicStabilityCoef <NUMBER>
* 5: _dragModel <NUMBER>
* 6: _ballisticCoefficients <NUMBER>
* 7: _velocityBoundaries <NUMBER>
* 8: _atmosphereModel <NUMBER>
* 9: _ammoTempMuzzleVelocityShifts <NUMBER>
* 10: _muzzleVelocityTable <NUMBER>
* 11: _barrelLengthTable <NUMBER>
*
* Example:
* ["ammo"] call ace_advanced_ballistics_fnc_readAmmoDataFromConfig
*
* Public: No
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,12 @@
* weapon - classname <STRING>
*
* Return Value:
* 0: _barrelTwist
* 1: _twistDirection
* 2: _barrelLength
* 0: _barrelTwist <NUMBER>
* 1: _twistDirection <NUMBER>
* 2: _barrelLength <NUMBER>
*
* Example:
* ["weapon"] call ace_advanced_ballistics_fnc_readWeaponDataFromConfig
*
* Public: No
*/
Expand Down
5 changes: 5 additions & 0 deletions addons/advanced_fatigue/functions/fnc_addDutyFactor.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
*
* Return Value:
* None
*
* Example:
* ["ID", 5] call ace_advanced_fatigue_fnc_addDutyFactor
*
* Public: No
*/
#include "script_component.hpp"
params [["_id", "", [""]], ["_factor", 1, [0, {}]]];
Expand Down
5 changes: 5 additions & 0 deletions addons/advanced_fatigue/functions/fnc_createStaminaBar.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
*
* Return Value:
* None
*
* Example:
* [DISPLAY] call ace_advanced_fatigue_fnc_createStaminaBar
*
* Public: No
*/
#include "script_component.hpp"
params ["_display"];
Expand Down
5 changes: 5 additions & 0 deletions addons/advanced_fatigue/functions/fnc_handlePlayerChanged.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
*
* Return Value:
* None
*
* Example:
* [newbob, oldbob] call ace_advanced_fatigue_fnc_handlePlayerChanged
*
* Public: No
*/
#include "script_component.hpp"
params ["_newUnit", "_oldUnit"];
Expand Down
5 changes: 5 additions & 0 deletions addons/advanced_fatigue/functions/fnc_handleStaminaBar.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
*
* Return Value:
* None
*
* Example:
* [0.5] call ace_advanced_fatigue_fnc_handleStaminaBar
*
* Public: No
*/
#include "script_component.hpp"
params ["_stamina"];
Expand Down
5 changes: 5 additions & 0 deletions addons/advanced_fatigue/functions/fnc_mainLoop.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
*
* Return Value:
* None
*
* Example:
* [] call ace_advanced_fatigue_fnc_mainLoop
*
* Public: No
*/
#include "script_component.hpp"
if (!alive ACE_player) exitWith { // Dead people don't breath, Will also handle null (Map intros)
Expand Down
5 changes: 5 additions & 0 deletions addons/advanced_fatigue/functions/fnc_moduleSettings.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
*
* Return Value:
* None
*
* Example:
* [MODULE] call ace_advanced_fatigue_fnc_moduleSettings
*
* Public: No
*/
#include "script_component.hpp"
params ["_logic"];
Expand Down
5 changes: 5 additions & 0 deletions addons/advanced_fatigue/functions/fnc_removeDutyFactor.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
*
* Return Value:
* None
*
* Example:
* ["ID"] call ace_advanced_fatigue_fnc_removeDutyFactor
*
* Public: No
*/
#include "script_component.hpp"
params [["_id", "", [""]]];
Expand Down
3 changes: 1 addition & 2 deletions addons/advanced_throwing/functions/fnc_moduleInit.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
* Example:
* [logic, [unit1, unit2], true] call ace_advanced_throwing_fnc_moduleInit
*
* Public:
* No
* Public: No
*/
#include "script_component.hpp"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
* None
*
* Return Value:
* Nothing
* None
*
* Example:
* call ace_advanced_throwing_fnc_renderPickUpInteraction
Expand Down
2 changes: 1 addition & 1 deletion addons/atragmx/functions/fnc_add_new_gun.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Nothing
*
* Return Value:
* Nothing
* None
*
* Example:
* call ace_atragmx_fnc_add_new_gun
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* Calculates distance at which the bullet velocity drops below the threshold velocity
*
* Arguments:
* theshold velocity <number>
* theshold velocity <NUMBER>
*
* Return Value:
* distance <number
* distance <NUMBER>
*
* Example:
* 403 call ace_atragmx_fnc_calculate_distance_at_velocity
Expand Down
4 changes: 2 additions & 2 deletions addons/atragmx/functions/fnc_calculate_range_card.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* Calculates the range card output based on the current data set
*
* Arguments:
* Nothing
* None
*
* Return Value:
* Nothing
* None
*
* Example:
* call ace_atragmx_fnc_calculate_range_card
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* Calculates the target range and updates the output fields
*
* Arguments:
* Nothing
* None
*
* Return Value:
* Nothing
* None
*
* Example:
* call ace_atragmx_fnc_calculate_target_range_assist
Expand Down Expand Up @@ -74,7 +74,7 @@ switch (_this) do {
if (_estRange > 0) then {
_imageSize = atan(_targetSize / _estRange);
};

switch (GVAR(rangeAssistImageSizeUnit)) do {
case 0: {
_imageSize = _imageSize * 6400 / 360;
Expand All @@ -93,7 +93,7 @@ switch (_this) do {
if (tan(_imageSize) != 0) then {
_estRange = _targetSize / tan(_imageSize);
};

ctrlSetText [7013, Str(Round(_estRange))];
};
};
4 changes: 2 additions & 2 deletions addons/atragmx/functions/fnc_calculate_target_solution.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* Calculates the fireing solution and updates the result input/output fields
*
* Arguments:
* Nothing
* None
*
* Return Value:
* Nothing
* None
*
* Example:
* call ace_atragmx_fnc_calculate_target_solution
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
* Calculates the target speed and updates the output fields
*
* Arguments:
* Nothing
* None
*
* Return Value:
* Nothing
* None
*
* Example:
* call ace_atragmx_fnc_calculate_target_speed_assist
Expand Down
8 changes: 4 additions & 4 deletions addons/atragmx/functions/fnc_calculate_truing_drop.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* parse input <BOOL>
*
* Return Value:
* Nothing
* None
*
* Example:
* call ace_atragmx_fnc_calculate_truing_drop
Expand All @@ -33,7 +33,7 @@ if (_parseInput) then {
_subsonicRange = Round(_subsonicRange);

_subsonicRange = _transonicRange max _subsonicRange;

_transonicDrop = -100 max parseNumber(ctrlText 18013) min 100;
_subsonicDrop = -100 max parseNumber(ctrlText 18014) min 100;
private _dropUnit = GVAR(currentScopeUnit);
Expand All @@ -56,7 +56,7 @@ if (_parseInput) then {
};
_transonicDrop = Round(_transonicDrop * 100) / 100;
_subsonicDrop = Round(_subsonicDrop * 100) / 100;

_subsonicDrop = _transonicDrop max _subsonicDrop;
};

Expand All @@ -65,7 +65,7 @@ if ((GVAR(truingDropDropData) select 0) == 0 || {!([_transonicRange, _subsonicRa
call FUNC(calculate_target_solution);
};
private _solutionInput = +GVAR(targetSolutionInput);

if (_transonicRange == 0) then {
_transonicRange = Round(403 call FUNC(calculate_distance_at_velocity));
};
Expand Down
Loading