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

SOG Compat - Fix compatibility with grad trenches (__has_include) #9189

Merged
merged 3 commits into from
May 1, 2023
Merged

SOG Compat - Fix compatibility with grad trenches (__has_include) #9189

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
223c604
SOG Compat - Fix compatibility with grad trenches (`__has_include`)
PabstMirror Apr 30, 2023
5a46970
Update script_component.hpp
PabstMirror Apr 30, 2023
99edc14
Merge branch 'master' into sog-gradTrenchHasInclude
PabstMirror Apr 30, 2023
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
15 changes: 15 additions & 0 deletions addons/common/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,18 @@
#endif

#include "\z\ace\addons\main\script_macros.hpp"

// just kept for BWC, canDig now uses GVAR(canDigSurfaces)
#define DIG_SURFACE_BLACKLIST [ \
"concrete", "concrete_exp", "concrete_int", "int_concrete", "int_concrete_exp", \
"pavement_exp", "int_pavement_exp", \
"tiling", "tiles_int", "int_tiles", \
"roof_tin", "roof_tiles", "rooftiles_exp", \
"tarmac", "asphalt_exp", \
"stones_exp", "rock", "stony", \
"metal", "gridmetal_exp", "metalplate_exp", "int_metalplate_exp", "metal_int", "wavymetal", "wavymetal_exp", "int_metal", "steel_exp", \
"lino_exp", "int_lino_exp", "int_mat_exp", \
"wood", "wood_int", "int_wood", "softwood_exp", "int_softwood_exp", "int_solidwood_exp" \
]

#define DIG_SURFACE_WHITELIST ["grass", "grasstall_exp", "forest_exp", "snow"]
3 changes: 3 additions & 0 deletions optionals/compat_sog/CfgVehicles/units.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#if __has_include("\x\grad_trenches\addons\main\config.bin")
#else
class Man;
class CAManBase: Man {
class ACE_SelfActions {
Expand All @@ -18,6 +20,7 @@ class CAManBase: Man {
};
};
};
#endif

class vn_b_men_aircrew_base;
class vn_b_men_jetpilot_01: vn_b_men_aircrew_base {
Expand Down
1 change: 1 addition & 0 deletions optionals/compat_sog/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
preprocess = false