Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
PabstMirror 2023-05-01 12:40:16 -05:00 committed by GitHub
parent cd41594a60
commit fedefd5799
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
addons/common/script_component.hpp
View File

@ -15,3 +15,18 @@
#endif #endif
#include "\z\ace\addons\main\script_macros.hpp" #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
optionals/compat_sog/CfgVehicles/units.hpp
View File

@ -1,3 +1,5 @@
#if __has_include("\x\grad_trenches\addons\main\config.bin")
#else
class Man; class Man;
class CAManBase: Man { class CAManBase: Man {
class ACE_SelfActions { class ACE_SelfActions {
@ -18,6 +20,7 @@ class CAManBase: Man {
}; };
}; };
}; };
#endif
class vn_b_men_aircrew_base; class vn_b_men_aircrew_base;
class vn_b_men_jetpilot_01: vn_b_men_aircrew_base { class vn_b_men_jetpilot_01: vn_b_men_aircrew_base {

1
optionals/compat_sog/addon.toml Normal file
View File

@ -0,0 +1 @@
preprocess = false