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.

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

Remove flags and only keep classes for BWC #128

Merged
merged 1 commit into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 0 additions & 23 deletions addons/flags/CfgEventHandlers.hpp

This file was deleted.

21 changes: 0 additions & 21 deletions addons/flags/CfgVehicles.hpp

This file was deleted.

129 changes: 75 additions & 54 deletions addons/flags/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -1,78 +1,99 @@
class CfgWeapons {
class CBA_MiscItem;
class CBA_MiscItem_ItemInfo;

class GVAR(white): CBA_MiscItem {
scope = 2;
author = CSTRING(Authors);
descriptionShort = CSTRING(Description);
descriptionUse = CSTRING(Description);
class ace_flags_white;
class GVAR(white): ace_flags_white {
scope = 1;
scopeCurator = 0;
scopeArsenal = 0;
author = ECSTRING(main,authors);

displayName = CSTRING(White);
picture = QPATHTOF(data\pictures\white_item.paa);
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 3;
};
};

GVAR(texture) = "\a3\data_f\flags\flag_white_co.paa";
GVAR(actionIconPlace) = QPATHTOF(data\icons\place\white_place_icon.paa);
GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\white_carry_icon.paa);
class ace_flags_red;
class GVAR(red): ace_flags_red {
scope = 1;
scopeCurator = 0;
scopeArsenal = 0;
author = ECSTRING(main,authors);

class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 3;
};
};
class GVAR(red): GVAR(white) {
displayName = CSTRING(Red);
picture = QPATHTOF(data\pictures\red_item.paa);

GVAR(texture) = "\a3\data_f\flags\flag_red_co.paa";
GVAR(actionIconPlace) = QPATHTOF(data\icons\place\red_place_icon.paa);
GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\red_carry_icon.paa);
};
class GVAR(blue): GVAR(white) {
displayName = CSTRING(Blue);
picture = QPATHTOF(data\pictures\blue_item.paa);
class ace_flags_blue;
class GVAR(blue): ace_flags_blue {
scope = 1;
scopeCurator = 0;
scopeArsenal = 0;
author = ECSTRING(main,authors);

GVAR(texture) = "\a3\data_f\flags\Flag_blue_co.paa";
GVAR(actionIconPlace) = QPATHTOF(data\icons\place\blue_place_icon.paa);
GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\blue_carry_icon.paa);
class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 3;
};
};
class GVAR(green): GVAR(white) {
displayName = CSTRING(Green);
picture = QPATHTOF(data\pictures\green_item.paa);

GVAR(texture) = "\a3\data_f\flags\flag_green_co.paa";
GVAR(actionIconPlace) = QPATHTOF(data\icons\place\green_place_icon.paa);
GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\green_carry_icon.paa);
class ace_flags_green;
class GVAR(green): ace_flags_green {
scope = 1;
scopeCurator = 0;
scopeArsenal = 0;
author = ECSTRING(main,authors);

class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 3;
};
};
class GVAR(yellow): GVAR(white) {
displayName = CSTRING(Yellow);
picture = QPATHTOF(data\pictures\yellow_item.paa);

GVAR(texture) = QPATHTOF(data\flag_yellow_co.paa);
GVAR(actionIconPlace) = QPATHTOF(data\icons\place\yellow_place_icon.paa);
GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\yellow_carry_icon.paa);
class ace_flags_yellow;
class GVAR(yellow): ace_flags_yellow {
scope = 1;
scopeCurator = 0;
scopeArsenal = 0;
author = ECSTRING(main,authors);

class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 3;
};
};
class GVAR(orange): GVAR(white) {
displayName = CSTRING(Orange);
picture = QPATHTOF(data\pictures\orange_item.paa);

GVAR(texture) = QPATHTOF(data\flag_orange_co.paa);
GVAR(actionIconPlace) = QPATHTOF(data\icons\place\orange_place_icon.paa);
GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\orange_carry_icon.paa);
class ace_flags_orange;
class GVAR(orange): ace_flags_orange {
scope = 1;
scopeCurator = 0;
scopeArsenal = 0;
author = ECSTRING(main,authors);

class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 3;
};
};
class GVAR(purple): GVAR(white) {
displayName = CSTRING(Purple);
picture = QPATHTOF(data\pictures\purple_item.paa);

GVAR(texture) = QPATHTOF(data\flag_purple_co.paa);
GVAR(actionIconPlace) = QPATHTOF(data\icons\place\purple_place_icon.paa);
GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\purple_carry_icon.paa);
class ace_flags_purple;
class GVAR(purple): ace_flags_purple {
scope = 1;
scopeCurator = 0;
scopeArsenal = 0;
author = ECSTRING(main,authors);

class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 3;
};
};
class GVAR(black): GVAR(white) {
displayName = CSTRING(Black);
picture = QPATHTOF(data\pictures\black_item.paa);

GVAR(texture) = QPATHTOF(data\flag_black_co.paa);
GVAR(actionIconPlace) = QPATHTOF(data\icons\place\black_place_icon.paa);
GVAR(actionIconCarry) = QPATHTOF(data\icons\carry\black_carry_icon.paa);
class ace_flags_black;
class GVAR(black): ace_flags_black {
scope = 1;
scopeCurator = 0;
scopeArsenal = 0;
author = ECSTRING(main,authors);

class ItemInfo: CBA_MiscItem_ItemInfo {
mass = 3;
};
};
};
1 change: 1 addition & 0 deletions addons/flags/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Flags have been moved to ACE 3.19.0! This component is only here for backwards compatibility.
8 changes: 0 additions & 8 deletions addons/flags/XEH_PREP.hpp

This file was deleted.

17 changes: 0 additions & 17 deletions addons/flags/XEH_missionDisplayLoad.sqf

This file was deleted.

40 changes: 0 additions & 40 deletions addons/flags/XEH_postInit.sqf

This file was deleted.

13 changes: 0 additions & 13 deletions addons/flags/XEH_preInit.sqf

This file was deleted.

6 changes: 0 additions & 6 deletions addons/flags/XEH_preStart.sqf

This file was deleted.

4 changes: 1 addition & 3 deletions addons/flags/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,12 @@ class CfgPatches {
QGVAR(black)
};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"ace_common", "ace_interact_menu", "ace_interaction"};
requiredAddons[] = {"mts_main", "ace_flags"};
author = ECSTRING(main,authors);
authors[] = {"Timi007"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};

#include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
Binary file removed addons/flags/data/flag_black_co.paa
Binary file not shown.
Binary file removed addons/flags/data/flag_orange_co.paa
Binary file not shown.
Binary file removed addons/flags/data/flag_purple_co.paa
Binary file not shown.
Binary file removed addons/flags/data/flag_yellow_co.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/carry/black_carry_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/carry/blue_carry_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/carry/green_carry_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/carry/orange_carry_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/carry/purple_carry_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/carry/red_carry_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/carry/white_carry_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/carry/white_furl_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/carry/yellow_carry_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/place/black_place_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/place/blue_place_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/place/green_place_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/place/orange_place_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/place/purple_place_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/place/red_place_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/place/white_pickup_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/place/white_place_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/icons/place/yellow_place_icon.paa
Binary file not shown.
Binary file removed addons/flags/data/pictures/black_item.paa
Binary file not shown.
Binary file removed addons/flags/data/pictures/blue_item.paa
Binary file not shown.
Binary file removed addons/flags/data/pictures/green_item.paa
Binary file not shown.
Binary file removed addons/flags/data/pictures/orange_item.paa
Binary file not shown.
Binary file removed addons/flags/data/pictures/purple_item.paa
Binary file not shown.
Binary file removed addons/flags/data/pictures/red_item.paa
Binary file not shown.
Binary file removed addons/flags/data/pictures/white_item.paa
Binary file not shown.
Binary file removed addons/flags/data/pictures/yellow_item.paa
Binary file not shown.
22 changes: 0 additions & 22 deletions addons/flags/functions/fnc_carriesFlag.sqf

This file was deleted.

27 changes: 0 additions & 27 deletions addons/flags/functions/fnc_carryFlag.sqf

This file was deleted.

27 changes: 0 additions & 27 deletions addons/flags/functions/fnc_furlFlag.sqf

This file was deleted.

Loading