mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
0644ad9ca2
* Added workaround functions for turret magazine ammo. * Switched to retrieving turrets dynamically instead of looking them up from an array. * Refactoring only, no functional changes * Repurposed getNeedRearmMagazines as a general purpose rearm info function + more. * The function retrieves all non-full magazines. This code was previously repeated in many different functions, but is now centralized in one. * Empty pylon filling is no longer supported in favor of the upcoming "pylons" ACE-module. Fixed bugs: * Rearm was using broken commands "magazineTurretAmmo" and "setMagazineTurretAmmo". They are now replaced with their corresponding workaround functions. * Pylon rearm was trying to set ammo count on empty pylons. Note: rearmSuccessLocal is not yet fixed! * Rearming no longer switches shell types in cannons/mortars. * Added Tuupertunut to authors. * Rearming no longer switches shell types. 2nd try. Last time it was fixed only if the turret is manned. Now it is fixed even when unmanned. * Updated fnc_rearm to support the earlier repurposing of fnc_getNeedRearmMagazines. * Small fixes and comments. * Renamed fnc_getVehicleMagazines to fnc_getTurretConfigMagazines. The latter describes much better what the function actually does. * Removed redundant checks. * Refactoring. * Fixed spaces in macros. * Renamed fnc_getAllTurrets to fnc_getAllRearmTurrets
41 lines
913 B
C++
41 lines
913 B
C++
|
|
PREP(addMagazineToSupply);
|
|
PREP(addRearmActions);
|
|
PREP(addVehicleMagazinesToSupply);
|
|
PREP(canReadSupplyCounter);
|
|
PREP(canRearm);
|
|
PREP(canStoreAmmo);
|
|
PREP(canTakeAmmo);
|
|
PREP(createDummy);
|
|
PREP(disable);
|
|
PREP(dropAmmo);
|
|
PREP(getAllRearmTurrets);
|
|
PREP(getCaliber);
|
|
PREP(getHardpointMagazines);
|
|
PREP(getMaxMagazines);
|
|
PREP(getNeedRearmMagazines);
|
|
PREP(getSupplyCount);
|
|
PREP(getTurretConfigMagazines);
|
|
PREP(getTurretMagazineAmmo);
|
|
PREP(grabAmmo);
|
|
PREP(handleKilled);
|
|
PREP(handleUnconscious);
|
|
PREP(hasEnoughSupply);
|
|
PREP(initSupplyVehicle);
|
|
PREP(makeDummy);
|
|
PREP(moduleRearmSettings);
|
|
PREP(pickUpAmmo);
|
|
PREP(readSupplyCounter);
|
|
PREP(rearm);
|
|
PREP(rearmEntireVehicle);
|
|
PREP(rearmEntireVehicleSuccess);
|
|
PREP(rearmEntireVehicleSuccessLocal);
|
|
PREP(rearmSuccess);
|
|
PREP(rearmSuccessLocal);
|
|
PREP(removeMagazineFromSupply);
|
|
PREP(setSupplyCount);
|
|
PREP(setTurretMagazineAmmo);
|
|
PREP(storeAmmo);
|
|
PREP(takeAmmo);
|
|
PREP(takeSuccess);
|