Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed clashing MACRO names

Browse Source
This commit is contained in:
ulteq 2015-05-16 21:10:34 +02:00
parent 9116fed415
commit f9b7e3c6f7
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/weather/functions/fnc_calculateDewPoint.sqf
View File

@ -20,6 +20,8 @@
PARAMS_2(_t,_rh); PARAMS_2(_t,_rh);
if (_rh == 0) exitWith { CELSIUS(0) };
// Source: https://en.wikipedia.org/wiki/Dew_point // Source: https://en.wikipedia.org/wiki/Dew_point
private ["_gamma"]; private ["_gamma"];

4
addons/weather/functions/fnc_calculateHeatIndex.sqf
View File

@ -28,7 +28,7 @@ PARAMS_2(_t,_rh);
// Source: https://en.wikipedia.org/wiki/Heat_index // Source: https://en.wikipedia.org/wiki/Heat_index
_t = FAHRENHEIT(_t); _t = TO_FAHRENHEIT(_t);
_rh = _rh * 100; // relative humidity in % _rh = _rh * 100; // relative humidity in %
CELSIUS(__C1 + __C2 * _t + __C3 * _rh + __C4 * _t * _rh + __C5 * _t^2 + __C6 * _rh^2 + __C7 * _t^2 * _rh + __C8 * _t * _rh^2) TO_CELSIUS(__C1 + __C2 * _t + __C3 * _rh + __C4 * _t * _rh + __C5 * _t^2 + __C6 * _rh^2 + __C7 * _t^2 * _rh + __C8 * _t * _rh^2)

4
addons/weather/script_component.hpp
View File

@ -18,5 +18,5 @@
#define WATER_VAPOR_MOLAR_MASS 0.018016 #define WATER_VAPOR_MOLAR_MASS 0.018016
#define DRY_AIR_MOLAR_MASS 0.028964 #define DRY_AIR_MOLAR_MASS 0.028964
#define SPECIFIC_GAS_CONSTANT_DRY_AIR 287.058 #define SPECIFIC_GAS_CONSTANT_DRY_AIR 287.058
#define CELSIUS(t) ((t - 32) / 1.8) #define TO_CELSIUS(t) ((t - 32) / 1.8)
#define FAHRENHEIT(t) (t * 1.8 + 32) #define TO_FAHRENHEIT(t) (t * 1.8 + 32)