Fixed tagging options not being shown

7Cav · Jul 12, 2024 · 9257785 · 9257785
1 parent 7117d33
commit 9257785
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/addons/tagging/ACE_Tags.hpp b/addons/tagging/ACE_Tags.hpp
@@ -1,6 +1,6 @@
 #define MACRO_GLUE(g1,g2) g1##g2
 #define MACRO_TAG(name,col) class TRIPLES(Cav_Tagging,##name##_##col##,F) { \
-        displayName = CSTRING(TRIPLES(Cav_Tagging,##name##_##col##,F)); \
+        displayName = CSTRING(TRIPLES(name,col,F)); \
         requiredItem = QUOTE(MACRO_GLUE(ACE_Spraypaint,col)); \
         textures[] = {QPATHTOF(UI\tags\tag_##name##_##col##_ca.paa)}; \
         icon = QPATHTOF(UI\icons\icon_action_##name##_##col##_ca.paa); \

diff --git a/addons/tagging/stringtable.xml b/addons/tagging/stringtable.xml
@@ -1,22 +1,22 @@
 <Project name="Cav">
     <Package name="Tagging">
         <Key ID="STR_Cav_Tagging_Cav_Black_F">
-            <English>Cav Black</English>
+            <English>Cav</English>
         </Key>
         <Key ID="STR_Cav_Tagging_Cav_Blue_F">
-            <English>Cav Blue</English>
+            <English>Cav</English>
         </Key>
         <Key ID="STR_Cav_Tagging_Cav_Green_F">
-            <English>Cav Green</English>
+            <English>Cav</English>
         </Key>
         <Key ID="STR_Cav_Tagging_Cav_Red_F">
-            <English>Cav Red</English>
+            <English>Cav</English>
         </Key>
         <Key ID="STR_Cav_Tagging_Cav_White_F">
-            <English>Cav White</English>
+            <English>Cav</English>
         </Key>
         <Key ID="STR_Cav_Tagging_Cav_Yellow_F">
-            <English>Cav Yellow</English>
+            <English>Cav</English>
         </Key>
     </Package>
 </Project>