Rearm - Limited Supply (Fix Merge Conflcits) #5182
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
PabstMirror
changed the title
jonpas
requested changes
May 31, 2017
| * 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) |
| * Arguments: | ||
| * 0: Ammo Truck <OBJECT> | ||
| * 1: Magazine Classname <STRING> | ||
| * 2: Only partial <BOOL>(optional) |
| params [ | ||
| ["_truck", objNull, [objNull]], | ||
| ["_vehicle", objNull, [objNull, ""]] | ||
| ]; |
There was a problem hiding this comment.
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.
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) |
| @@ -0,0 +1,42 @@ | |||
| /* | |||
| * Author: GitHawk | |||
| * Returns true if the magazine is in the current supply | |||
| * Arguments: | ||
| * 0: Ammo Truck <OBJECT> | ||
| * 1: Magazine Classname <STRING> | ||
| * 2: Number of Rounds to withdraw <NUMBER>(optional) |
jonpas
approved these changes
Jun 8, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix merge conflicts for PR #3431