diff --git a/ace_artillerytables.dll b/ace_artillerytables.dll new file mode 100644 index 0000000000..2f5855c81a Binary files /dev/null and b/ace_artillerytables.dll differ diff --git a/ace_artillerytables_x64.dll b/ace_artillerytables_x64.dll index 666fc1a3ed..97a061c257 100644 Binary files a/ace_artillerytables_x64.dll and b/ace_artillerytables_x64.dll differ diff --git a/addons/artillerytables/functions/fnc_interactMenuOpened.sqf b/addons/artillerytables/functions/fnc_interactMenuOpened.sqf index d169b896c1..849be932ce 100644 --- a/addons/artillerytables/functions/fnc_interactMenuOpened.sqf +++ b/addons/artillerytables/functions/fnc_interactMenuOpened.sqf @@ -10,7 +10,7 @@ * Can Open * * Example: - * [bob, bob] call ace_artillerytables_fnc_interactMenuOpened + * [1] call ace_artillerytables_fnc_interactMenuOpened * * Public: No */ diff --git a/addons/artillerytables/functions/fnc_rangeTableOpen.sqf b/addons/artillerytables/functions/fnc_rangeTableOpen.sqf index b072ec6220..754c10356c 100644 --- a/addons/artillerytables/functions/fnc_rangeTableOpen.sqf +++ b/addons/artillerytables/functions/fnc_rangeTableOpen.sqf @@ -13,7 +13,7 @@ * None * * Example: - * [] call ace_artillerytables_fnc_rangeTableOpen + * ["mortar_155mm_AMOS", -5, 80, true] call ace_artillerytables_fnc_rangeTableOpen * * Public: No */ diff --git a/addons/artillerytables/functions/fnc_turretChanged.sqf b/addons/artillerytables/functions/fnc_turretChanged.sqf index 3d6b13bf84..1975f65c73 100644 --- a/addons/artillerytables/functions/fnc_turretChanged.sqf +++ b/addons/artillerytables/functions/fnc_turretChanged.sqf @@ -11,7 +11,7 @@ * Nothing * * Example: - * [player] call ace_artillerytables_fnc_turretChanged + * [player, [0]] call ace_artillerytables_fnc_turretChanged * * Public: No */ diff --git a/addons/artillerytables/functions/fnc_turretPFEH.sqf b/addons/artillerytables/functions/fnc_turretPFEH.sqf index b7dce95f18..5ab7c499b0 100644 --- a/addons/artillerytables/functions/fnc_turretPFEH.sqf +++ b/addons/artillerytables/functions/fnc_turretPFEH.sqf @@ -10,10 +10,11 @@ * Nothing * * Example: - * [[]] call ace_artillerytables_fnc_turretPFEH + * [[...]] call ace_artillerytables_fnc_turretPFEH * * Public: No */ + (_this select 0) params ["_vehicle", "_turret", "_fireModes", "_useAltElevation", "_turretAnimBody", "_invalidGunnerMem"]; if (shownArtilleryComputer && {GVAR(disableArtilleryComputer)}) then { @@ -89,9 +90,3 @@ GVAR(predictedAzimuth) = _realAzimuth; GVAR(predictedElevation) = _realElevation; END_COUNTER(pfeh); - -#ifdef DEBUG_MODE_FULL -// private _lookVector = (AGLtoASL (positionCameraToWorld [0,0,0])) vectorFromTo (AGLtoASL (positionCameraToWorld [0,0,10])); -// systemChat format ["AZ: %1 EL: %2", _realAzimuth toFixed 1, _realElevation toFixed 1]; -// systemChat format ["Slope: %1 - Look: %2 [%3]", (acos ((vectorUp _vehicle) select 2)) toFixed 1, ((_lookVector select 0) atan2 (_lookVector select 1)), ["GND","SKY"] select _useRealWeaponDir]; -#endif diff --git a/extensions/CMakeLists.txt b/extensions/CMakeLists.txt index 8dfc3b1948..4e09a08f0b 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 15) -set(ACE_VERSION_REVISION 6) +set(ACE_VERSION_MINOR 13) +set(ACE_VERSION_REVISION 0) EXECUTE_PROCESS(COMMAND git rev-parse --verify HEAD OUTPUT_VARIABLE T_ACE_VERSION_BUILD OUTPUT_STRIP_TRAILING_WHITESPACE diff --git a/extensions/artillerytables/artillerytables.cpp b/extensions/artillerytables/artillerytables.cpp index 4ac7a80a07..ade05ff3e0 100644 --- a/extensions/artillerytables/artillerytables.cpp +++ b/extensions/artillerytables/artillerytables.cpp @@ -18,7 +18,7 @@ #include #include - // ace libs: +// ace libs: #include "vector.hpp" #ifndef TEST_EXE @@ -226,17 +226,17 @@ std::string simulateCalcRangeTableLine(const double _rangeToHit, const double _m #ifndef ACE_FULL_VERSION_STR #define ACE_FULL_VERSION_STR "not defined" #endif -void RVExtensionVersion(char* output, int outputSize) { +void __stdcall RVExtensionVersion(char* output, int outputSize) { strncpy_s(output, outputSize, ACE_FULL_VERSION_STR, _TRUNCATE); } -void RVExtension(char* output, int outputSize, const char* function) { +void __stdcall RVExtension(char* output, int outputSize, const char* function) { if (!strcmp(function, "version")) { RVExtensionVersion(output, outputSize); return; } strncpy_s(output, outputSize, "error", _TRUNCATE); } -int RVExtensionArgs(char* output, int outputSize, const char* function, const char** args, int argsCnt) { +int __stdcall RVExtensionArgs(char* output, int outputSize, const char* function, const char** args, int argsCnt) { if (!strcmp(function, "version")) { RVExtensionVersion(output, outputSize); return 0; @@ -266,7 +266,7 @@ int RVExtensionArgs(char* output, int outputSize, const char* function, const ch } const double loopStart = (bestDistance < 4000) ? 50 : 100; const double loopInc = (bestDistance < 5000) ? 50 : 100; // simplify when range gets high - const double loopMaxRange = std::min(bestDistance, 25000.0); // with no air resistance, max range could go higher than 60km + const double loopMaxRange = std::min(bestDistance, 30000.0); // with no air resistance, max range could go higher than 60km if (maxElev > minElev) { // don't bother if we can't hit anything (e.g. mortar in low mode) for (double range = loopStart; range < loopMaxRange; range += loopInc) {