From fedfa94dcd89c495910405441ecb06c52fe8509a Mon Sep 17 00:00:00 2001
From: VKing <kauestad@gmail.com>
Date: Thu, 21 Jan 2016 15:01:41 +0100
Subject: [PATCH] Clean up
---
addons/fcs/functions/fnc_calculateSolution.sqf | 10 ++++------
addons/fcs/functions/fnc_getRange.sqf | 13 +++++--------
2 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/addons/fcs/functions/fnc_calculateSolution.sqf b/addons/fcs/functions/fnc_calculateSolution.sqf
index e2c46c7262..45a60e403e 100644
--- a/addons/fcs/functions/fnc_calculateSolution.sqf
+++ b/addons/fcs/functions/fnc_calculateSolution.sqf
@@ -30,15 +30,13 @@ private _turretConfig = [configFile >> "CfgVehicles" >> typeOf _vehicle, _turret
private _airFriction = getNumber (configFile >> "CfgAmmo" >> _ammo >> "airFriction");
{
- private ["_weapon", "_muzzles", "_weaponMagazines", "_muzzleMagazines"];
- _weapon = _x;
- _muzzles = getArray (configFile >> "CfgWeapons" >> _weapon >> "muzzles");
- _weaponMagazines = getArray (configFile >> "CfgWeapons" >> _weapon >> "magazines");
+ private _weapon = _x;
+ private _muzzles = getArray (configFile >> "CfgWeapons" >> _weapon >> "muzzles");
+ private _weaponMagazines = getArray (configFile >> "CfgWeapons" >> _weapon >> "magazines");
{
if (_x != "this") then {
- _muzzleMagazines = getArray (configFile >> "CfgWeapons" >> _weapon >> _x >> "magazines");
- _weaponMagazines append _muzzleMagazines;
+ _weaponMagazines append getArray (configFile >> "CfgWeapons" >> _weapon >> _x >> "magazines");
};
false
} count _muzzles;
diff --git a/addons/fcs/functions/fnc_getRange.sqf b/addons/fcs/functions/fnc_getRange.sqf
index b9047bb26d..64619241c4 100644
--- a/addons/fcs/functions/fnc_getRange.sqf
+++ b/addons/fcs/functions/fnc_getRange.sqf
@@ -25,15 +25,12 @@ private _distance = parseNumber ctrlText (_dlgRangefinder displayCtrl 151);
if (_distance == 0) then {
_distance = _this call EFUNC(common,getTargetDistance);
} else {
- if (_distance > _maxDistance) then {
- _distance = _maxDistance;
- };
+ // Is distance out of bound?
+ _distance = _distance min _maxDistance;
+ _distance = _distance max _minDistance;
- if (_distance < _minDistance) then {
- _distance = _minDistance;
- };
-
- _accuracy = if(_accuracy < 1) then {1} else {_accuracy};
+ // If don't let accuracy be less than 1
+ _accuracy = _accuracy max 1;
_distance = (round (_distance/_accuracy)) * _accuracy;
};