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

Optionals - Add No Medical and No Realistic Names components #8187

Merged
merged 12 commits into from
Sep 4, 2023
Merged

Optionals - Add No Medical and No Realistic Names components #8187

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
378df6c
Add nomedical and norealisticnames components
Dystopian Mar 10, 2021
fea13ca
Merge remote-tracking branch 'upstream/master' into nomedical
Dystopian Mar 27, 2022
0bfdab7
Add fire component disabling
Dystopian Mar 27, 2022
9a3ec0f
Merge remote-tracking branch 'upstream/master' into nomedical
Dystopian Jun 22, 2023
655fbe6
Make it work
Dystopian Jun 23, 2023
83b47ce
remove headlight skipping
LinkIsGrim Aug 3, 2023
f10e7a7
Merge branch 'master' of https://github.com/acemod/ACE3
LinkIsGrim Aug 5, 2023
fee1741
Merge branch 'master' of https://github.com/acemod/ACE3
LinkIsGrim Aug 5, 2023
fae6079
Merge branch 'master' into nomedical
LinkIsGrim Aug 5, 2023
a8aa453
update preprocess syntax
LinkIsGrim Aug 5, 2023
9a49ad2
fix git screwup
LinkIsGrim Aug 5, 2023
4eaca5b
Apply suggestions from code review
jonpas Aug 11, 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
2 changes: 2 additions & 0 deletions addons/fire/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/fire/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
Comment on lines +3 to +9
Copy link
Member

@jonpas jonpas Aug 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
ACE_PATCH_NOT_LOADED(ADDON,"No Medical")
#else

Why not just this? 🤔

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This way can define PATCH_SKIP with several conditions. E.g.:

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif
#if __has_include("\some\other_addon\config.bin")
#define PATCH_SKIP "Some Other Addon"
#endif

and then you use PATCH_SKIP just once to disable component with ACE_PATCH_NOT_LOADED. In this PR this is mostly a good template for other __has_include components. I liked @PabstMirror idea and implemeted it here too.
See also

ACE3/addons/compat_ws/config.cpp

Lines 3 to 9 in fdbcc62

#if __has_include("\lxWS\data_f_lxWS\config.bin")
#else
#define PATCH_SKIP "Western Sahara"
#endif
#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)

Also you have PATCH_SKIP undefined in suggestion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok your example adds multiple conditions, but you can also do that like this:

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#if __has_include("\some\other_addon\config.bin")
ACE_PATCH_NOT_LOADED(ADDON,"Some Other Addon")
#else
ACE_PATCH_NOT_LOADED(ADDON,"No Medical")
#else
// default config
#endif
#endif

Although that is uglier and I wouldn't want to do it.

Not sure, we just need the opposite of skipWhenMissingDependencies!

Fixed suggestion.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not fully sure about #if, but I seem to remember that preprocessor "commands" like that are not able to be nested(at least #ifdef is not able to be nested)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, and they also don't support logical operators I believe. Yeah, we need a skipWhenLoaded.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

#if __has_include("\rhsafrf\addons\rhs_main\loadorder\config.bin")
#else
    #define PATCH_SKIP "RHS AFRF"
#endif

#if __has_include("\z\ace\addons\explosives\script_component.hpp")
#else
    #ifdef PATCH_SKIP
    #else
        #define PATCH_SKIP "ACE Explosives"
    #endif
#endif

works on game, mikro and hemtt

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about #ifndef, is it working everywhere ? Cuz if it is, I don't see why do ifdef-else.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but I seem to remember that preprocessor "commands" like that are not able to be nested(at least #ifdef is not able to be nested)

This should be fixed at least for a patch or two.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#9294 seems to work fine with nesting.

class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -18,3 +25,5 @@ class CfgPatches {
#include "CfgSounds.hpp"
#include "ACE_Medical_Treatment_Actions.hpp"
#include "RscTitles.hpp"

#endif
2 changes: 2 additions & 0 deletions addons/medical/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
PabstMirror marked this conversation as resolved.
Show resolved Hide resolved
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -21,3 +28,5 @@ class CfgPatches {
class ACE_Tests {
medicalHitpoints = QPATHTOF(dev\test_hitpointConfigs.sqf);
};

#endif
2 changes: 2 additions & 0 deletions addons/medical_ai/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical_ai/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -16,3 +23,5 @@ class CfgPatches {

#include "ACE_Settings.hpp"
#include "CfgEventHandlers.hpp"

#endif
2 changes: 2 additions & 0 deletions addons/medical_blood/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical_blood/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -16,3 +23,5 @@ class CfgPatches {

#include "CfgEventHandlers.hpp"
#include "ACE_Settings.hpp"

#endif
2 changes: 2 additions & 0 deletions addons/medical_damage/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical_damage/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand Down Expand Up @@ -27,3 +34,5 @@ class ACE_Extensions {
};
};
*/

#endif
2 changes: 2 additions & 0 deletions addons/medical_engine/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical_engine/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -21,3 +28,5 @@ class CfgPatches {
#include "CfgMoves.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"

#endif
2 changes: 2 additions & 0 deletions addons/medical_feedback/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical_feedback/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -20,3 +27,5 @@ class CfgPatches {
#include "CfgVehicles.hpp"
#include "RscTitles.hpp"
#include "RscInGameUI.hpp"

#endif
2 changes: 2 additions & 0 deletions addons/medical_gui/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical_gui/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -18,3 +25,5 @@ class CfgPatches {
#include "CfgEventHandlers.hpp"
#include "CfgVehicles.hpp"
#include "gui.hpp"

#endif
2 changes: 2 additions & 0 deletions addons/medical_statemachine/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical_statemachine/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -16,3 +23,5 @@ class CfgPatches {

#include "Statemachine.hpp"
#include "CfgEventHandlers.hpp"

#endif
2 changes: 2 additions & 0 deletions addons/medical_status/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical_status/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -16,3 +23,5 @@ class CfgPatches {

#include "ACE_settings.hpp"
#include "CfgEventHandlers.hpp"

#endif
2 changes: 2 additions & 0 deletions addons/medical_treatment/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical_treatment/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -22,3 +29,5 @@ class CfgPatches {
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"
#include "Cfg3DEN.hpp"

#endif
2 changes: 2 additions & 0 deletions addons/medical_vitals/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/medical_vitals/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\nomedical\script_component.hpp")
#define PATCH_SKIP "No Medical"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -15,3 +22,5 @@ class CfgPatches {
};

#include "CfgEventHandlers.hpp"

#endif
2 changes: 2 additions & 0 deletions addons/realisticnames/addon.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[preprocess]
enabled = false
9 changes: 9 additions & 0 deletions addons/realisticnames/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
#include "script_component.hpp"

#if __has_include("\z\ace\addons\norealisticnames\script_component.hpp")
#define PATCH_SKIP "No Realistic Names"
#endif

#ifdef PATCH_SKIP
ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
#else
class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
Expand All @@ -20,3 +27,5 @@ class CfgPatches {
#include "CfgMagazines.hpp"
#include "CfgVehicles.hpp"
#include "CfgWeapons.hpp"

#endif
1 change: 1 addition & 0 deletions optionals/nomedical/$PBOPREFIX$
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
z\ace\addons\nomedical
jonpas marked this conversation as resolved.
Show resolved Hide resolved
15 changes: 15 additions & 0 deletions optionals/nomedical/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {};
author = ECSTRING(common,ACETeam);
authors[] = {"Dystopian"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};
6 changes: 6 additions & 0 deletions optionals/nomedical/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#define COMPONENT nomedical
#define COMPONENT_BEAUTIFIED No Medical

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

#include "\z\ace\addons\main\script_macros.hpp"
1 change: 1 addition & 0 deletions optionals/norealisticnames/$PBOPREFIX$
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
z\ace\addons\norealisticnames
jonpas marked this conversation as resolved.
Show resolved Hide resolved
15 changes: 15 additions & 0 deletions optionals/norealisticnames/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {};
author = ECSTRING(common,ACETeam);
authors[] = {"Dystopian"};
url = ECSTRING(main,URL);
VERSION_CONFIG;
};
};
6 changes: 6 additions & 0 deletions optionals/norealisticnames/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#define COMPONENT norealisticnames
#define COMPONENT_BEAUTIFIED No Realistic Names

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

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