-
Notifications
You must be signed in to change notification settings - Fork 149
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into relative-includes
- Loading branch information
Showing
23 changed files
with
133 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,2 @@ | ||
#define COMPONENT jam_finish | ||
#include "\x\cba\addons\main\script_mod.hpp" | ||
#include "\x\cba\addons\main\script_macros.hpp" | ||
#define SUBCOMPONENT finish | ||
#include "\x\cba\addons\jam\script_component.hpp" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,2 @@ | ||
#define COMPONENT jr_prep | ||
#include "\x\cba\addons\main\script_mod.hpp" | ||
#include "\x\cba\addons\main\script_macros.hpp" | ||
#define SUBCOMPONENT prep | ||
#include "\x\cba\addons\jr\script_component.hpp" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#define SUBCOMPONENT helper | ||
#include "\x\cba\addons\ui\script_component.hpp" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#define SUBCOMPONENT a3 | ||
#include "\x\cba\addons\xeh\script_component.hpp" |
19 changes: 0 additions & 19 deletions
19
addons/xeh/compat_contact/config.cpp → addons/xeh/xeh_contact/CfgVehicles.hpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#include "script_component.hpp" | ||
|
||
class CfgPatches { | ||
class SUBADDON { | ||
name = CSTRING(component); | ||
units[] = {}; | ||
weapons[] = {}; | ||
requiredVersion = REQUIRED_VERSION; | ||
requiredAddons[] = {"cba_xeh", "A3_Data_F_Contact"}; | ||
skipWhenMissingDependencies = 1; | ||
author = "$STR_CBA_Author"; | ||
authors[] = {"PabstMirror"}; | ||
url = "$STR_CBA_URL"; | ||
VERSION_CONFIG; | ||
|
||
// this prevents any patched class from requiring XEH | ||
addonRootClass = "A3_Characters_F"; | ||
}; | ||
}; | ||
|
||
class XEH_CLASS_BASE; | ||
|
||
#include "CfgVehicles.hpp" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#define SUBCOMPONENT contact | ||
#include "..\script_component.hpp" |
19 changes: 0 additions & 19 deletions
19
addons/xeh/compat_csla/config.cpp → addons/xeh/xeh_csla/CfgVehicles.hpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#include "script_component.hpp" | ||
|
||
class CfgPatches { | ||
class SUBADDON { | ||
name = CSTRING(component); | ||
units[] = {}; | ||
weapons[] = {}; | ||
requiredVersion = REQUIRED_VERSION; | ||
requiredAddons[] = {"cba_xeh", "CSLA", "US85"}; | ||
skipWhenMissingDependencies = 1; | ||
author = "$STR_CBA_Author"; | ||
authors[] = {"Dahlgren"}; | ||
url = "$STR_CBA_URL"; | ||
VERSION_CONFIG; | ||
|
||
// this prevents any patched class from requiring XEH | ||
addonRootClass = "A3_Characters_F"; | ||
}; | ||
}; | ||
|
||
class XEH_CLASS_BASE; | ||
|
||
#include "CfgVehicles.hpp" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#define SUBCOMPONENT csla | ||
#include "..\script_component.hpp" |
19 changes: 0 additions & 19 deletions
19
addons/xeh/compat_sog/config.cpp → addons/xeh/xeh_sog/CfgVehicles.hpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#include "script_component.hpp" | ||
|
||
class CfgPatches { | ||
class SUBADDON { | ||
name = CSTRING(component); | ||
units[] = {}; | ||
weapons[] = {}; | ||
requiredVersion = REQUIRED_VERSION; | ||
requiredAddons[] = {"cba_xeh", "loadorder_f_vietnam"}; | ||
skipWhenMissingDependencies = 1; | ||
author = "$STR_CBA_Author"; | ||
authors[] = {"Dahlgren"}; | ||
url = "$STR_CBA_URL"; | ||
VERSION_CONFIG; | ||
|
||
// this prevents any patched class from requiring XEH | ||
addonRootClass = "A3_Characters_F"; | ||
}; | ||
}; | ||
|
||
class XEH_CLASS_BASE; | ||
|
||
#include "CfgVehicles.hpp" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#define SUBCOMPONENT sog | ||
#include "..\script_component.hpp" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
#include "script_component.hpp" | ||
|
||
class CfgPatches { | ||
class SUBADDON { | ||
name = CSTRING(component); | ||
units[] = {}; | ||
weapons[] = {}; | ||
requiredVersion = REQUIRED_VERSION; | ||
requiredAddons[] = {"cba_xeh", "data_f_lxWS"}; | ||
skipWhenMissingDependencies = 1; | ||
author = "$STR_CBA_Author"; | ||
authors[] = {"Dahlgren"}; | ||
url = "$STR_CBA_URL"; | ||
VERSION_CONFIG; | ||
|
||
// this prevents any patched class from requiring XEH | ||
addonRootClass = "A3_Characters_F"; | ||
}; | ||
}; | ||
|
||
class XEH_CLASS_BASE; | ||
|
||
#include "CfgVehicles.hpp" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
#define SUBCOMPONENT ws | ||
#include "..\script_component.hpp" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,2 @@ | ||
#define COMPONENT legacy_jr_prep | ||
#include "\x\cba\addons\main\script_mod.hpp" | ||
#include "\x\cba\addons\main\script_macros.hpp" | ||
#define SUBCOMPONENT prep | ||
#include "\x\cba\addons\legacy_jr\script_component.hpp" |