From 97ef173f2271ae1ed55041475eb4957050a82bf2 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Wed, 6 Mar 2024 17:12:14 -0600
Subject: [PATCH] Revert "CUP Compats - Don't load if cup's compats present
 (temporary) (#9824)"

This reverts commit f63704911eb4874a72781126c63d034f46dc6b63.
---
 addons/compat_cup_terrains/addon.toml |  3 ---
 addons/compat_cup_terrains/config.cpp | 11 -----------
 addons/compat_cup_vehicles/addon.toml |  3 ---
 addons/compat_cup_vehicles/config.cpp | 11 -----------
 addons/compat_cup_weapons/addon.toml  |  3 ---
 addons/compat_cup_weapons/config.cpp  | 11 -----------
 6 files changed, 42 deletions(-)
 delete mode 100644 addons/compat_cup_terrains/addon.toml
 delete mode 100644 addons/compat_cup_vehicles/addon.toml
 delete mode 100644 addons/compat_cup_weapons/addon.toml

diff --git a/addons/compat_cup_terrains/addon.toml b/addons/compat_cup_terrains/addon.toml
deleted file mode 100644
index bf39213892e..00000000000
--- a/addons/compat_cup_terrains/addon.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[tools]
-pboProject_noBinConfig = true
-sqfvm_skipConfigChecks = true
diff --git a/addons/compat_cup_terrains/config.cpp b/addons/compat_cup_terrains/config.cpp
index ab58974a32f..a7020be4da9 100644
--- a/addons/compat_cup_terrains/config.cpp
+++ b/addons/compat_cup_terrains/config.cpp
@@ -1,15 +1,6 @@
 #include "script_component.hpp"
 #include "\z\ace\addons\refuel\defines.hpp"
 
-// Remove after next cup release
-#pragma hemtt flag pe23_ignore_has_include
-#if __has_include("\cup\CUP_Terrains_ACE_compat\config.bin")
-#define PATCH_SKIP "CUP_Terrains_ACE_compat"
-#endif
-
-#ifdef PATCH_SKIP
-ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
-#else
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
@@ -34,5 +25,3 @@ class CfgPatches {
 
 #include "CfgVehicles.hpp"
 #include "CfgEventHandlers.hpp"
-
-#endif
diff --git a/addons/compat_cup_vehicles/addon.toml b/addons/compat_cup_vehicles/addon.toml
deleted file mode 100644
index bf39213892e..00000000000
--- a/addons/compat_cup_vehicles/addon.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[tools]
-pboProject_noBinConfig = true
-sqfvm_skipConfigChecks = true
diff --git a/addons/compat_cup_vehicles/config.cpp b/addons/compat_cup_vehicles/config.cpp
index 624d411fa4a..513993ef57c 100644
--- a/addons/compat_cup_vehicles/config.cpp
+++ b/addons/compat_cup_vehicles/config.cpp
@@ -1,14 +1,5 @@
 #include "script_component.hpp"
 
-// Remove after next cup release
-#pragma hemtt flag pe23_ignore_has_include
-#if __has_include("\cup\CUP_Vehicles_ACE_compat\config.bin")
-#define PATCH_SKIP "CUP_Vehicles_ACE_compat"
-#endif
-
-#ifdef PATCH_SKIP
-ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
-#else
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
@@ -29,5 +20,3 @@ class CfgPatches {
 
 #include "CfgEventHandlers.hpp"
 #include "CfgVehicles.hpp"
-
-#endif
diff --git a/addons/compat_cup_weapons/addon.toml b/addons/compat_cup_weapons/addon.toml
deleted file mode 100644
index bf39213892e..00000000000
--- a/addons/compat_cup_weapons/addon.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[tools]
-pboProject_noBinConfig = true
-sqfvm_skipConfigChecks = true
diff --git a/addons/compat_cup_weapons/config.cpp b/addons/compat_cup_weapons/config.cpp
index e4c073b0845..e5fd0225558 100644
--- a/addons/compat_cup_weapons/config.cpp
+++ b/addons/compat_cup_weapons/config.cpp
@@ -1,14 +1,5 @@
 #include "script_component.hpp"
 
-// Remove after next cup release
-#pragma hemtt flag pe23_ignore_has_include
-#if __has_include("\cup\CUP_Weapons_ACE_compat\config.bin")
-#define PATCH_SKIP "CUP_Weapons_ACE_compat"
-#endif
-
-#ifdef PATCH_SKIP
-ACE_PATCH_NOT_LOADED(ADDON,PATCH_SKIP)
-#else
 class CfgPatches {
     class ADDON {
         name = COMPONENT_NAME;
@@ -27,5 +18,3 @@ class CfgPatches {
 #include "CfgMagazines.hpp"
 #include "CfgWeapons.hpp"
 #include "CfgEventHandlers.hpp"
-
-#endif