This commit is contained in:
VKing 2016-01-21 15:01:41 +01:00
parent 4406f270e2
commit fedfa94dcd
2 changed files with 9 additions and 14 deletions

View File

@ -30,15 +30,13 @@ private _turretConfig = [configFile >> "CfgVehicles" >> typeOf _vehicle, _turret
private _airFriction = getNumber (configFile >> "CfgAmmo" >> _ammo >> "airFriction"); private _airFriction = getNumber (configFile >> "CfgAmmo" >> _ammo >> "airFriction");
{ {
private ["_weapon", "_muzzles", "_weaponMagazines", "_muzzleMagazines"]; private _weapon = _x;
_weapon = _x; private _muzzles = getArray (configFile >> "CfgWeapons" >> _weapon >> "muzzles");
_muzzles = getArray (configFile >> "CfgWeapons" >> _weapon >> "muzzles"); private _weaponMagazines = getArray (configFile >> "CfgWeapons" >> _weapon >> "magazines");
_weaponMagazines = getArray (configFile >> "CfgWeapons" >> _weapon >> "magazines");
{ {
if (_x != "this") then { if (_x != "this") then {
_muzzleMagazines = getArray (configFile >> "CfgWeapons" >> _weapon >> _x >> "magazines"); _weaponMagazines append getArray (configFile >> "CfgWeapons" >> _weapon >> _x >> "magazines");
_weaponMagazines append _muzzleMagazines;
}; };
false false
} count _muzzles; } count _muzzles;

View File

@ -25,15 +25,12 @@ private _distance = parseNumber ctrlText (_dlgRangefinder displayCtrl 151);
if (_distance == 0) then { if (_distance == 0) then {
_distance = _this call EFUNC(common,getTargetDistance); _distance = _this call EFUNC(common,getTargetDistance);
} else { } else {
if (_distance > _maxDistance) then { // Is distance out of bound?
_distance = _maxDistance; _distance = _distance min _maxDistance;
}; _distance = _distance max _minDistance;
if (_distance < _minDistance) then { // If don't let accuracy be less than 1
_distance = _minDistance; _accuracy = _accuracy max 1;
};
_accuracy = if(_accuracy < 1) then {1} else {_accuracy};
_distance = (round (_distance/_accuracy)) * _accuracy; _distance = (round (_distance/_accuracy)) * _accuracy;
}; };