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

build 32dll, fix some headers

Browse Source
This commit is contained in:
PabstMirror 2019-09-03 20:28:48 -05:00
parent f5aa320ee6
commit ba461a5773
8 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ace_artillerytables.dll Normal file
View File

Binary file not shown.

BIN
ace_artillerytables_x64.dll
View File

Binary file not shown.

2
addons/artillerytables/functions/fnc_interactMenuOpened.sqf
View File

@ -10,7 +10,7 @@
* Can Open <BOOL> * Can Open <BOOL>
* *
* Example: * Example:
* [bob, bob] call ace_artillerytables_fnc_interactMenuOpened * [1] call ace_artillerytables_fnc_interactMenuOpened
* *
* Public: No * Public: No
*/ */

2
addons/artillerytables/functions/fnc_rangeTableOpen.sqf
View File

@ -13,7 +13,7 @@
* None * None
* *
* Example: * Example:
* [] call ace_artillerytables_fnc_rangeTableOpen * ["mortar_155mm_AMOS", -5, 80, true] call ace_artillerytables_fnc_rangeTableOpen
* *
* Public: No * Public: No
*/ */

2
addons/artillerytables/functions/fnc_turretChanged.sqf
View File

@ -11,7 +11,7 @@
* Nothing * Nothing
* *
* Example: * Example:
* [player] call ace_artillerytables_fnc_turretChanged * [player, [0]] call ace_artillerytables_fnc_turretChanged
* *
* Public: No * Public: No
*/ */

9
addons/artillerytables/functions/fnc_turretPFEH.sqf
View File

@ -10,10 +10,11 @@
* Nothing * Nothing
* *
* Example: * Example:
* [[]] call ace_artillerytables_fnc_turretPFEH * [[...]] call ace_artillerytables_fnc_turretPFEH
* *
* Public: No * Public: No
*/ */
(_this select 0) params ["_vehicle", "_turret", "_fireModes", "_useAltElevation", "_turretAnimBody", "_invalidGunnerMem"]; (_this select 0) params ["_vehicle", "_turret", "_fireModes", "_useAltElevation", "_turretAnimBody", "_invalidGunnerMem"];
if (shownArtilleryComputer && {GVAR(disableArtilleryComputer)}) then { if (shownArtilleryComputer && {GVAR(disableArtilleryComputer)}) then {
@ -89,9 +90,3 @@ GVAR(predictedAzimuth) = _realAzimuth;
GVAR(predictedElevation) = _realElevation; GVAR(predictedElevation) = _realElevation;
END_COUNTER(pfeh); 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

4
extensions/CMakeLists.txt
View File

@ -89,8 +89,8 @@ endif()
string(TIMESTAMP ACE_BUILDSTAMP "%Y-%m-%dT%H:%M:%SZ") string(TIMESTAMP ACE_BUILDSTAMP "%Y-%m-%dT%H:%M:%SZ")
set(ACE_VERSION_MAJOR 3) set(ACE_VERSION_MAJOR 3)
set(ACE_VERSION_MINOR 15) set(ACE_VERSION_MINOR 13)
set(ACE_VERSION_REVISION 6) set(ACE_VERSION_REVISION 0)
EXECUTE_PROCESS(COMMAND git rev-parse --verify HEAD EXECUTE_PROCESS(COMMAND git rev-parse --verify HEAD
OUTPUT_VARIABLE T_ACE_VERSION_BUILD OUTPUT_VARIABLE T_ACE_VERSION_BUILD
OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_STRIP_TRAILING_WHITESPACE

10
extensions/artillerytables/artillerytables.cpp
View File

@ -18,7 +18,7 @@
#include <chrono> #include <chrono>
#include <future> #include <future>
// ace libs: // ace libs:
#include "vector.hpp" #include "vector.hpp"
#ifndef TEST_EXE #ifndef TEST_EXE
@ -226,17 +226,17 @@ std::string simulateCalcRangeTableLine(const double _rangeToHit, const double _m
#ifndef ACE_FULL_VERSION_STR #ifndef ACE_FULL_VERSION_STR
#define ACE_FULL_VERSION_STR "not defined" #define ACE_FULL_VERSION_STR "not defined"
#endif #endif
void RVExtensionVersion(char* output, int outputSize) { void __stdcall RVExtensionVersion(char* output, int outputSize) {
strncpy_s(output, outputSize, ACE_FULL_VERSION_STR, _TRUNCATE); 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")) { if (!strcmp(function, "version")) {
RVExtensionVersion(output, outputSize); RVExtensionVersion(output, outputSize);
return; return;
} }
strncpy_s(output, outputSize, "error", _TRUNCATE); 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")) { if (!strcmp(function, "version")) {
RVExtensionVersion(output, outputSize); RVExtensionVersion(output, outputSize);
return 0; 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 loopStart = (bestDistance < 4000) ? 50 : 100;
const double loopInc = (bestDistance < 5000) ? 50 : 100; // simplify when range gets high 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) 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) { for (double range = loopStart; range < loopMaxRange; range += loopInc) {