diff --git a/ace_advanced_ballistics.dll b/ace_advanced_ballistics.dll index 41e0533991..a35dcbd2da 100644 Binary files a/ace_advanced_ballistics.dll and b/ace_advanced_ballistics.dll differ diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index 299a9f4a5b..c152ce1e21 100644 --- a/extensions/CMakeLists.txt +++ b/extensions/CMakeLists.txt @@ -89,8 +89,8 @@ endif() string(TIMESTAMP ACE_BUILDSTAMP "%Y-%m-%dT%H:%M:%SZ") set(ACE_VERSION_MAJOR 3) -set(ACE_VERSION_MINOR 2) -set(ACE_VERSION_REVISION 0) +set(ACE_VERSION_MINOR 4) +set(ACE_VERSION_REVISION 1) EXECUTE_PROCESS(COMMAND git rev-parse --verify HEAD OUTPUT_VARIABLE T_ACE_VERSION_BUILD OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/extensions/advanced_ballistics/AdvancedBallistics.cpp b/extensions/advanced_ballistics/AdvancedBallistics.cpp index 203243cd9d..8286e054d2 100644 --- a/extensions/advanced_ballistics/AdvancedBallistics.cpp +++ b/extensions/advanced_ballistics/AdvancedBallistics.cpp @@ -5,6 +5,7 @@ #include #include + #define GRAVITY 9.80665f #define ABSOLUTE_ZERO_IN_CELSIUS -273.15f #define KELVIN(t) (t - ABSOLUTE_ZERO_IN_CELSIUS) @@ -572,8 +573,8 @@ void __stdcall RVExtension(char *output, int outputSize, const char *function) positionOffset[1] += cos(bulletDir + M_PI / 2) * horizontalDeflectionPartial; } - double centripetalAccel = 2 * 0.0000729 * (bulletDatabase[index].muzzleVelocity / -32.2) * cos(bulletDatabase[index].latitude) * sin(bulletDir); - velocityOffset[2] -= centripetalAccel * deltaT; + double centripetalAccel = 2 * 0.0000729 * (bulletDatabase[index].muzzleVelocity) * cos(bulletDatabase[index].latitude) * sin(bulletDir); + velocityOffset[2] += centripetalAccel * deltaT; double spinDrift = bulletDatabase[index].twistDirection * 0.0254 * 1.25 * (bulletDatabase[index].stabilityFactor + 1.2) * pow(TOF, 1.83); double spinDriftPartial = spinDrift - bulletDatabase[index].spinDrift; diff --git a/extensions/common/shared.hpp b/extensions/common/shared.hpp index 6c49b99fad..ac8cebaf94 100644 --- a/extensions/common/shared.hpp +++ b/extensions/common/shared.hpp @@ -1,5 +1,9 @@ #pragma once +//_USE_MATH_DEFINES + cmath needs to be first or M_PI won't be defined in VS2015 +#define _USE_MATH_DEFINES +#include + #include "targetver.h" #include #include @@ -11,7 +15,6 @@ #include #include #include -#include #include #include #include "ace_version.hpp" diff --git a/optionals/compat_rhs_usf3/CfgAmmo.hpp b/optionals/compat_rhs_usf3/CfgAmmo.hpp index 44c0285e40..b830d5e564 100644 --- a/optionals/compat_rhs_usf3/CfgAmmo.hpp +++ b/optionals/compat_rhs_usf3/CfgAmmo.hpp @@ -139,7 +139,8 @@ class CfgAmmo ace_frag_skip = 1; ace_frag_force = 0; }; - class rhs_ammo_m69: GrenadeHand { + class GrenadeHand_stone; + class rhs_ammo_m69: GrenadeHand_stone { ace_frag_enabled = 0; ace_frag_skip = 1; ace_frag_force = 0;