Merge pull request #1353 from acemod/cleanup_ATragMX_AB

Removed a deprecated function and fixed some typos.
This commit is contained in:
ulteq 2015-05-22 18:42:20 +02:00
commit 9536423f2e
4 changed files with 2 additions and 43 deletions

View File

@ -4,7 +4,7 @@
* Reads the weapon class config and updates the config cache * Reads the weapon class config and updates the config cache
* *
* Arguments: * Arguments:
* 0: ammo - classname <string> * 0: weapon - classname <string>
* *
* Return Value: * Return Value:
* 0: [_barrelTwist, _twistDirection, _barrelLength] <ARRAY> * 0: [_barrelTwist, _twistDirection, _barrelLength] <ARRAY>

View File

@ -4,7 +4,6 @@ ADDON = false;
PREP(add_new_gun); PREP(add_new_gun);
PREP(calculate_range_card); PREP(calculate_range_card);
PREP(calculate_scope_base_angle);
PREP(calculate_solution); PREP(calculate_solution);
PREP(calculate_target_range_assist); PREP(calculate_target_range_assist);
PREP(calculate_target_solution); PREP(calculate_target_solution);

View File

@ -1,40 +0,0 @@
/*
* Author: Ruthberg
* Calculates a new scope base angle
*
* Arguments:
* 0: Bullet mass <NUMBER>
* 1: Bore height <NUMBER>
* 2: air friction <NUMBER>
* 3: muzzle velocity <NUMBER>
* 4: zero range <NUMBER>
*
* Return Value:
* scope base angle <NUMBER>
*
* Example:
* call ace_atragmx_calculate_scope_base_angle
*
* Public: No
*/
#include "script_component.hpp"
private ["_bulletMass", "_boreHeight", "_airFriction", "_muzzleVelocity", "_zeroRange"];
_bulletMass = _this select 0;
_boreHeight = _this select 1;
_airFriction = _this select 2;
_muzzleVelocity = _this select 3;
_zeroRange = _this select 4;
private ["_scopeBaseAngle"];
_scopeBaseAngle = 0;
private ["_temperature", "_barometricPressure", "_relativeHumidity"];
_temperature = 15;
_barometricPressure = 1013.25;
_relativeHumidity = 0;
private ["_result"];
_result = [_scopeBaseAngle, _bulletMass, _boreHeight, _airFriction, _muzzleVelocity, _temperature, _barometricPressure, _relativeHumidity, 1000, [0, 0], 0, 0, 0, _zeroRange, _airFriction, 1, "ICAO", false, 1.5, 0, 0, 0] call FUNC(calculate_solution);
_scopeBaseAngle + (_result select 0) / 60

View File

@ -37,7 +37,7 @@
* 8: Spin drift (MOA) <NUMBER> * 8: Spin drift (MOA) <NUMBER>
* *
* Example: * Example:
* call ace_atragmx_calculate_target_range_assist * call ace_atragmx_calculate_solution
* *
* Public: No * Public: No
*/ */