From 6cc960aacc7382824f2e2d87c849e3595b274d32 Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sun, 18 Sep 2016 15:19:17 +0200
Subject: [PATCH] fix nocrosshair being in addons and optionals

---
 addons/nocrosshair/$PBOPREFIX$             |  1 -
 addons/nocrosshair/CfgInGameUI.hpp         |  6 ------
 addons/nocrosshair/README.md               | 11 -----------
 addons/nocrosshair/config.cpp              | 18 ------------------
 addons/nocrosshair/script_component.hpp    | 18 ------------------
 optionals/nocrosshair/config.cpp           |  6 ++++--
 optionals/nocrosshair/script_component.hpp |  8 +++++++-
 7 files changed, 11 insertions(+), 57 deletions(-)
 delete mode 100644 addons/nocrosshair/$PBOPREFIX$
 delete mode 100644 addons/nocrosshair/CfgInGameUI.hpp
 delete mode 100644 addons/nocrosshair/README.md
 delete mode 100644 addons/nocrosshair/config.cpp
 delete mode 100644 addons/nocrosshair/script_component.hpp

diff --git a/addons/nocrosshair/$PBOPREFIX$ b/addons/nocrosshair/$PBOPREFIX$
deleted file mode 100644
index 8296f48d6e..0000000000
--- a/addons/nocrosshair/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\ace\addons\nocrosshair
\ No newline at end of file
diff --git a/addons/nocrosshair/CfgInGameUI.hpp b/addons/nocrosshair/CfgInGameUI.hpp
deleted file mode 100644
index cdaf4eba78..0000000000
--- a/addons/nocrosshair/CfgInGameUI.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-class CfgInGameUI {
-    class Cursor {
-        weapon = ""; // "\A3\ui_f\data\igui\cfg\cursors\weapon_ca.paa";
-    };
-};
diff --git a/addons/nocrosshair/README.md b/addons/nocrosshair/README.md
deleted file mode 100644
index ac9bcf43e0..0000000000
--- a/addons/nocrosshair/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-ace_nocrosshair
-===========
-
-Removes weapon crosshair.
-
-
-## Maintainers
-
-The people responsible for merging changes to this component or answering potential questions.
-
-- [commy2](https://github.com/commy2)
diff --git a/addons/nocrosshair/config.cpp b/addons/nocrosshair/config.cpp
deleted file mode 100644
index b7528917ef..0000000000
--- a/addons/nocrosshair/config.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
-    class ADDON {
-        ACE_isOptional = 1;
-        name = COMPONENT_NAME;
-        units[] = {};
-        weapons[] = {};
-        requiredVersion = REQUIRED_VERSION;
-        requiredAddons[] = {"ace_common"};
-        author = ECSTRING(common,ACETeam);
-        authors[] = {"commy2"};
-        url = ECSTRING(main,URL);
-        VERSION_CONFIG;
-    };
-};
-
-#include "CfgInGameUI.hpp"
diff --git a/addons/nocrosshair/script_component.hpp b/addons/nocrosshair/script_component.hpp
deleted file mode 100644
index 5f3bea04c6..0000000000
--- a/addons/nocrosshair/script_component.hpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#define COMPONENT nocrosshair
-#define COMPONENT_BEAUTIFIED No Crosshair
-#include "\z\ace\addons\main\script_mod.hpp"
-
-// #define DEBUG_MODE_FULL
-// #define DISABLE_COMPILE_CACHE
-// #define CBA_DEBUG_SYNCHRONOUS
-// #define ENABLE_PERFORMANCE_COUNTERS
-
-#ifdef DEBUG_ENABLED_NOCROSSHAIR
-    #define DEBUG_MODE_FULL
-#endif
-
-#ifdef DEBUG_ENABLED_NOCROSSHAIR
-    #define DEBUG_SETTINGS DEBUG_ENABLED_NOCROSSHAIR
-#endif
-
-#include "\z\ace\addons\main\script_macros.hpp"
diff --git a/optionals/nocrosshair/config.cpp b/optionals/nocrosshair/config.cpp
index fbe984b3ce..b7528917ef 100644
--- a/optionals/nocrosshair/config.cpp
+++ b/optionals/nocrosshair/config.cpp
@@ -3,12 +3,14 @@
 class CfgPatches {
     class ADDON {
         ACE_isOptional = 1;
+        name = COMPONENT_NAME;
         units[] = {};
         weapons[] = {};
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {"ace_common"};
-        author[] = {"commy2"};
-        authorUrl = "https://github.com/commy2";
+        author = ECSTRING(common,ACETeam);
+        authors[] = {"commy2"};
+        url = ECSTRING(main,URL);
         VERSION_CONFIG;
     };
 };
diff --git a/optionals/nocrosshair/script_component.hpp b/optionals/nocrosshair/script_component.hpp
index 639c46376f..5f3bea04c6 100644
--- a/optionals/nocrosshair/script_component.hpp
+++ b/optionals/nocrosshair/script_component.hpp
@@ -1,6 +1,12 @@
 #define COMPONENT nocrosshair
+#define COMPONENT_BEAUTIFIED No Crosshair
 #include "\z\ace\addons\main\script_mod.hpp"
 
+// #define DEBUG_MODE_FULL
+// #define DISABLE_COMPILE_CACHE
+// #define CBA_DEBUG_SYNCHRONOUS
+// #define ENABLE_PERFORMANCE_COUNTERS
+
 #ifdef DEBUG_ENABLED_NOCROSSHAIR
     #define DEBUG_MODE_FULL
 #endif
@@ -9,4 +15,4 @@
     #define DEBUG_SETTINGS DEBUG_ENABLED_NOCROSSHAIR
 #endif
 
-#include "\z\ace\addons\main\script_macros.hpp"
\ No newline at end of file
+#include "\z\ace\addons\main\script_macros.hpp"