-
Notifications
You must be signed in to change notification settings - Fork 736
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rearm - Limited Supply (Fix Merge Conflcits) #5182
Conversation
Adding width as optional fourth parameter
# Merged Conflicts in addons/rearm/CfgVehicles.hpp
Made params nicer, replaced some forEach and used params in XEH_respawn
…itHawk-rearm_supply Conflicts: addons/attach/functions/fnc_getChildrenAttachActions.sqf addons/common/functions/fnc_dumpArray.sqf addons/common/functions/fnc_removeAllEventHandlers.sqf addons/common/functions/fnc_removeEventHandler.sqf addons/common/functions/fnc_serverEvent.sqf addons/common/functions/fnc_waitUntilAndExecute.sqf addons/explosives/functions/fnc_scriptedExplosive.sqf addons/finger/config.cpp addons/frag/config.cpp addons/interact_menu/functions/fnc_handlePlayerChanged.sqf addons/laser/functions/fnc_laserOn.sqf addons/laser/functions/fnc_seekerFindLaserSpot.sqf addons/laser/functions/fnc_unitTurretCanLockLaser.sqf addons/laser/functions/fnc_vanillaLaserSeekerHandler.sqf addons/laser_selfdesignate/functions/fnc_findLaserSource.sqf addons/laser_selfdesignate/functions/fnc_laserHudDesignateOff.sqf addons/main/config.cpp addons/main/script_mod.hpp addons/map/functions/fnc_flashlightGlow.sqf addons/maptools/functions/fnc_addLineMarker.sqf addons/maptools/functions/fnc_canDraw.sqf addons/maptools/functions/fnc_cancelDrawing.sqf addons/maptools/functions/fnc_copyMapReceiveMarkers.sqf addons/maptools/functions/fnc_copyMapRemoteSend.sqf addons/maptools/functions/fnc_copyMapStart.sqf addons/maptools/functions/fnc_handleKeyDown.sqf addons/maptools/functions/fnc_handleMouseZChanged.sqf addons/maptools/functions/fnc_removeLineMarker.sqf addons/maptools/functions/fnc_updateLineMarker.sqf addons/missileguidance/functions/fnc_checkLos.sqf addons/missileguidance/functions/fnc_checkSeekerAngle.sqf addons/overheating/CfgWeapons.hpp addons/overheating/functions/fnc_swapBarrelCallback.sqf addons/rearm/XEH_postInit.sqf addons/rearm/XEH_respawn.sqf addons/rearm/functions/fnc_canRearm.sqf addons/rearm/functions/fnc_dropAmmo.sqf addons/rearm/functions/fnc_getMaxMagazines.sqf addons/rearm/functions/fnc_grabAmmo.sqf addons/rearm/functions/fnc_pickUpAmmo.sqf addons/rearm/functions/fnc_rearmEntireVehicleSuccess.sqf addons/rearm/functions/fnc_rearmEntireVehicleSuccessLocal.sqf addons/rearm/functions/fnc_rearmSuccess.sqf addons/rearm/functions/fnc_rearmSuccessLocal.sqf addons/rearm/functions/fnc_storeAmmo.sqf addons/repair/functions/fnc_useItem.sqf addons/tagging/CfgVehicles.hpp addons/ui/ACE_UI.hpp optionals/tracers/config.cpp
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not all are requested changes, but more comments about style of writing.
* Display a structured text. | ||
* | ||
* Arguments: | ||
* 0: Text <ANY> | ||
* 1: Size of the textbox <NUMBER> (default: 1.5) | ||
* 2: Target Unit. Will only display if target is the player controlled object <OBJECT> (default: ACE_player) | ||
* 3: Custom Width <NUMBER> (optional) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(default: 10)
* Arguments: | ||
* 0: Ammo Truck <OBJECT> | ||
* 1: Magazine Classname <STRING> | ||
* 2: Only partial <BOOL>(optional) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<BOOL> (default: false)
params [ | ||
["_truck", objNull, [objNull]], | ||
["_vehicle", objNull, [objNull, ""]] | ||
]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All that type checking is a bit redundant (not sure about performance difference), also lengthy.
false | ||
} count _magazines; | ||
false | ||
} count REARM_TURRET_PATHS; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would keep it on forEach
so we don't need to return the stupid false
, performance difference is so minimal it doesn't matter here.
* 0: Target <OBJECT> | ||
* 1: Disable <BOOL><OPTIONAL> | ||
* 0: Vehicle <OBJECT> | ||
* 1: Disable <BOOL>(optional) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(default: true)
@@ -0,0 +1,42 @@ | |||
/* | |||
* Author: GitHawk | |||
* Returns true if the magazine is in the current supply |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Missing final dot.
* Arguments: | ||
* 0: Ammo Truck <OBJECT> | ||
* 1: Magazine Classname <STRING> | ||
* 2: Number of Rounds to withdraw <NUMBER>(optional) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(default: -1)
Fix merge conflicts for PR #3431