Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Allow Attach Flag module to be used with flagpoles #749

Merged
merged 3 commits into from
Mar 25, 2024
Merged

Allow Attach Flag module to be used with flagpoles #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d909bfc
remove AllVehicles check for allow attachFlag to all objects
Apricot-ale Oct 7, 2023
2e083f4
Merge branch 'master' into apr-edit
mharis001 Mar 25, 2024
4547ba0
Add FlagCarrier check
mharis001 Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions addons/modules/functions/fnc_moduleAttachFlag.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ if !(alive _object) exitWith {
[LSTRING(OnlyAlive)] call EFUNC(common,showMessage);
};

if !(_object isKindOf "AllVehicles") exitWith {
[LSTRING(OnlyVehicles)] call EFUNC(common,showMessage);
if !(_object isKindOf "AllVehicles" || {_object isKindOf "FlagCarrier"}) exitWith {
[LSTRING(OnlyVehiclesOrFlags)] call EFUNC(common,showMessage);
};

private _flagsCache = +(uiNamespace getVariable QGVAR(flagsCache));
Expand Down
3 changes: 3 additions & 0 deletions addons/modules/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3441,6 +3441,9 @@
<Chinese>單位必須是載具</Chinese>
<Japanese>ユニットは車両である必要があります</Japanese>
</Key>
<Key ID="STR_ZEN_Modules_OnlyVehiclesOrFlags">
<English>Unit must be a vehicle or flag</English>
</Key>
<Key ID="STR_ZEN_Modules_OnlyAircraft">
<English>The unit must be an aircraft</English>
<Russian>Применимо только к воздушной технике</Russian>
Expand Down
Loading