Merge pull request #1222 from acemod/cleanupWeather

Weather module macro cleanup
This commit is contained in:
ulteq 2015-05-15 14:20:40 +02:00
commit f835ba95e8
2 changed files with 3 additions and 6 deletions

View File

@ -16,12 +16,9 @@
*/ */
#include "script_component.hpp" #include "script_component.hpp"
private ["_temperature", "_pressure", "_relativeHumidity"]; PARAMS_3(_temperature, _pressure, _relativeHumidity);
_temperature = _this select 0; // in C
_pressure = _this select 1; // in hPa
_relativeHumidity = _this select 2; // as ratio 0-1
_pressure = _pressure * 100; _pressure = _pressure * 100; // hPa to Pa
if (_relativeHumidity > 0) then { if (_relativeHumidity > 0) then {
private ["_pSat", "_vaporPressure", "_partialPressure"]; private ["_pSat", "_vaporPressure", "_partialPressure"];

View File

@ -18,7 +18,7 @@
private ["_windSpeed", "_windDir", "_height", "_newWindSpeed", "_windSource", "_roughnessLength"]; private ["_windSpeed", "_windDir", "_height", "_newWindSpeed", "_windSource", "_roughnessLength"];
EXPLODE_4_PVT(_this,_position,_windGradientEnabled,_terrainEffectEnabled,_obstacleEffectEnabled); PARAMS_4(_position,_windGradientEnabled,_terrainEffectEnabled,_obstacleEffectEnabled);
fnc_polar2vect = { fnc_polar2vect = {
private ["_mag2D"]; private ["_mag2D"];