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

Update xeh macros #446

Merged
merged 2 commits into from
Jul 27, 2016
Merged

Update xeh macros #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58910d0
macro for xeh base class
commy2 Jul 27, 2016
289e057
use xeh base class in XEH_ENABLED macro of xeh component
commy2 Jul 27, 2016
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
1 change: 1 addition & 0 deletions addons/main/script_macros_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1528,6 +1528,7 @@ Macro: OBSOLETE()

// XEH Specific
#define XEH_CLASS CBA_Extended_EventHandlers
#define XEH_CLASS_BASE DOUBLES(XEH_CLASS,base)
#define XEH_DISABLED class EventHandlers { class XEH_CLASS {}; }; SLX_XEH_DISABLED = 1
#define XEH_ENABLED class EventHandlers { class XEH_CLASS { EXTENDED_EVENTHANDLERS }; }; SLX_XEH_DISABLED = 0

Expand Down
6 changes: 3 additions & 3 deletions addons/xeh/CfgEventHandlers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@

class DOUBLES(XEH_CLASS,base) {
class XEH_CLASS_BASE {
EXTENDED_EVENTHANDLERS
};

class XEH_CLASS: DOUBLES(XEH_CLASS,base) {}; // bwc
class XEH_CLASS: XEH_CLASS_BASE {}; // bwc

class DefaultEventhandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};

// The PreStart handlers run once when the game is started
Expand Down
28 changes: 14 additions & 14 deletions addons/xeh/CfgVehicles.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,85 +155,85 @@ class CfgVehicles {
};
class Land_Pod_Heli_Transport_04_ammo_F: Pod_Heli_Transport_04_base_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_bench_F: Pod_Heli_Transport_04_crewed_base_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_box_F: Pod_Heli_Transport_04_base_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_covered_F: Pod_Heli_Transport_04_crewed_base_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_fuel_F: Pod_Heli_Transport_04_base_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_medevac_F: Pod_Heli_Transport_04_crewed_base_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_repair_F: Pod_Heli_Transport_04_base_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_ammo_black_F: Land_Pod_Heli_Transport_04_ammo_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_bench_black_F: Land_Pod_Heli_Transport_04_bench_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_box_black_F: Land_Pod_Heli_Transport_04_box_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_covered_black_F: Land_Pod_Heli_Transport_04_covered_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_fuel_black_F: Land_Pod_Heli_Transport_04_fuel_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_medevac_black_F: Land_Pod_Heli_Transport_04_medevac_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

class Land_Pod_Heli_Transport_04_repair_black_F: Land_Pod_Heli_Transport_04_repair_F {
class EventHandlers: EventHandlers {
class XEH_CLASS: DOUBLES(XEH_CLASS,base) {};
class XEH_CLASS: XEH_CLASS_BASE {};
};
};

Expand Down
2 changes: 1 addition & 1 deletion addons/xeh/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
#define XEH_MAIN_CONFIGS [configFile, campaignConfigFile, missionConfigFile]

#undef XEH_ENABLED
#define XEH_ENABLED class EventHandlers { class XEH_CLASS: XEH_CLASS {}; }; SLX_XEH_DISABLED = 0
#define XEH_ENABLED class EventHandlers { class XEH_CLASS: XEH_CLASS_BASE {}; }; SLX_XEH_DISABLED = 0

#define XEH_EVENTS \
"AnimChanged", \
Expand Down