From 7a95e2a7bde5acd434bbd2b85b3454a174f7e73b Mon Sep 17 00:00:00 2001 From: ulteq Date: Fri, 15 May 2015 14:20:18 +0200 Subject: [PATCH] Weather module macro cleanup --- addons/weather/functions/fnc_calculateAirDensity.sqf | 7 ++----- addons/weather/functions/fnc_calculateWindSpeed.sqf | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/addons/weather/functions/fnc_calculateAirDensity.sqf b/addons/weather/functions/fnc_calculateAirDensity.sqf index 298049e51d..b30e0c4e01 100644 --- a/addons/weather/functions/fnc_calculateAirDensity.sqf +++ b/addons/weather/functions/fnc_calculateAirDensity.sqf @@ -16,12 +16,9 @@ */ #include "script_component.hpp" -private ["_temperature", "_pressure", "_relativeHumidity"]; -_temperature = _this select 0; // in C -_pressure = _this select 1; // in hPa -_relativeHumidity = _this select 2; // as ratio 0-1 +PARAMS_3(_temperature, _pressure, _relativeHumidity); -_pressure = _pressure * 100; +_pressure = _pressure * 100; // hPa to Pa if (_relativeHumidity > 0) then { private ["_pSat", "_vaporPressure", "_partialPressure"]; diff --git a/addons/weather/functions/fnc_calculateWindSpeed.sqf b/addons/weather/functions/fnc_calculateWindSpeed.sqf index b5cde4e959..d991897b97 100644 --- a/addons/weather/functions/fnc_calculateWindSpeed.sqf +++ b/addons/weather/functions/fnc_calculateWindSpeed.sqf @@ -18,7 +18,7 @@ private ["_windSpeed", "_windDir", "_height", "_newWindSpeed", "_windSource", "_roughnessLength"]; -EXPLODE_4_PVT(_this,_position,_windGradientEnabled,_terrainEffectEnabled,_obstacleEffectEnabled); +PARAMS_4(_position,_windGradientEnabled,_terrainEffectEnabled,_obstacleEffectEnabled); fnc_polar2vect = { private ["_mag2D"];