diff --git a/addons/flags/XEH_PREP.hpp b/addons/flags/XEH_PREP.hpp index df3a939c76..0ddfcdded8 100644 --- a/addons/flags/XEH_PREP.hpp +++ b/addons/flags/XEH_PREP.hpp @@ -1,7 +1,7 @@ -PREP(addActions); PREP(carriesFlag); PREP(carryFlag); PREP(furlFlag); +PREP(getActions); PREP(getFlags); PREP(handleScrollWheel); PREP(pickupFlag); diff --git a/addons/flags/functions/fnc_furlFlag.sqf b/addons/flags/functions/fnc_furlFlag.sqf index 2325a03f26..8089b462c3 100644 --- a/addons/flags/functions/fnc_furlFlag.sqf +++ b/addons/flags/functions/fnc_furlFlag.sqf @@ -1,7 +1,7 @@ #include "script_component.hpp" /* * Author: Timi007 - * Stops carrying flag and add flag item to unit. + * Stops carrying flag and adds flag item back to unit. * * Arguments: * 0: Unit diff --git a/addons/flags/functions/fnc_addActions.sqf b/addons/flags/functions/fnc_getActions.sqf similarity index 93% rename from addons/flags/functions/fnc_addActions.sqf rename to addons/flags/functions/fnc_getActions.sqf index 17ea7918e0..d1d8070bb5 100644 --- a/addons/flags/functions/fnc_addActions.sqf +++ b/addons/flags/functions/fnc_getActions.sqf @@ -1,7 +1,7 @@ #include "script_component.hpp" /* * Author: Timi007 - * Adds the child actions for placing and carring flags. + * Gets the child actions for placing and carring flags. * * Arguments: * 0: Player @@ -10,7 +10,7 @@ * Actions * * Example: - * [player] call ace_flags_fnc_addActions + * [player] call ace_flags_fnc_getActions * * Public: No */ diff --git a/addons/flags/functions/fnc_handleScrollWheel.sqf b/addons/flags/functions/fnc_handleScrollWheel.sqf index b5ff1afbea..98d48cd86f 100644 --- a/addons/flags/functions/fnc_handleScrollWheel.sqf +++ b/addons/flags/functions/fnc_handleScrollWheel.sqf @@ -17,7 +17,9 @@ params ["_scrollAmount"]; -if (GVAR(isPlacing) isNotEqualTo PLACE_WAITING) exitWith {false}; +if (GVAR(isPlacing) isNotEqualTo PLACE_WAITING) exitWith { + false +}; // Move object height 10cm per scroll GVAR(objectHeight) = GVAR(objectHeight) + (_scrollAmount * 0.1); diff --git a/addons/flags/functions/fnc_placeFlag.sqf b/addons/flags/functions/fnc_placeFlag.sqf index d4e806ca5b..f149693621 100644 --- a/addons/flags/functions/fnc_placeFlag.sqf +++ b/addons/flags/functions/fnc_placeFlag.sqf @@ -20,10 +20,9 @@ params ["_player", "_item"]; TRACE_2("Placing flag", _player, _item); -// Create local object private _flag = "FlagChecked_F" createVehicle [0, 0, 0]; -// Set object start height +// Set flag start height GVAR(objectHeight) = MIN_HEIGHT; GVAR(isPlacing) = PLACE_WAITING; @@ -56,7 +55,7 @@ private _mouseClickID = [_player, "DefaultAction", { [_player, "DefaultAction", _mouseClickID] call EFUNC(common,removeActionEventHandler); if (GVAR(isPlacing) isEqualTo PLACE_APPROVE) then { - // End position of the object + // End position of the flag GVAR(isPlacing) = PLACE_CANCEL;