Fix CA modicons pointing to a freezetag cvar

diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc
index 2bf470f1563c36be8bb6f84dd83ba54d792c45b3..2bded9d6a9e861670b34355ec9a28b430606ddf0 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qc
@@ -42,16 +42,8 @@ void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, int
                drawstring_aspect(myPos, ftos(stat), mySize, color, panel_fg_alpha, DRAWFLAG_NORMAL);
 }
 
-// Clan Arena and Freeze Tag HUD modicons
-void HUD_Mod_CA(vector myPos, vector mySize)
+void HUD_Mod_CA_Draw(vector myPos, vector mySize, int layout)
 {
-       mod_active = 1; // required in each mod function that always shows something
-
-       int layout;
-       if(ISGAMETYPE(CA))
-               layout = autocvar_hud_panel_modicons_ca_layout;
-       else //if(ISGAMETYPE(FREEZETAG))
-               layout = autocvar_hud_panel_modicons_freezetag_layout;
        int rows, columns;
        float aspect_ratio;
        aspect_ratio = (layout) ? 2 : 1;
@@ -77,3 +69,11 @@ void HUD_Mod_CA(vector myPos, vector mySize)
                }
        }
 }
+
+// Clan Arena and Freeze Tag HUD modicons
+void HUD_Mod_CA(vector myPos, vector mySize)
+{
+       mod_active = 1; // required in each mod function that always shows something
+
+       HUD_Mod_CA_Draw(myPos, mySize, autocvar_hud_panel_modicons_ca_layout);
+}

diff --git a/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qh b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qh
index 206f1f5db344f44e07405e838604353b1954587d..7ccd5bbb2fa4a7cb86f43f8eec14643680310471 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qh
+++ b/qcsrc/common/gamemodes/gamemode/clanarena/cl_clanarena.qh
@@ -1,4 +1,5 @@
 #pragma once
 
 void HUD_Mod_CA(vector myPos, vector mySize);
+void HUD_Mod_CA_Draw(vector myPos, vector mySize, int layout);
 void HUD_Mod_CA_Export(int fh);

diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qc b/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qc
index e7443db6789c1cac479100ff615cf8cd4119f490..df4931a37133793b69a021ed28d66d106b70beee 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qc
+++ b/qcsrc/common/gamemodes/gamemode/freezetag/cl_freezetag.qc
@@ -1,6 +1,15 @@
 #include "cl_freezetag.qh"
 
+#include <common/gamemodes/gamemode/clanarena/cl_clanarena.qh>
+
 void HUD_Mod_FreezeTag_Export(int fh)
 {
        HUD_Write_Cvar("hud_panel_modicons_freezetag_layout");
 }
+
+void HUD_Mod_FreezeTag(vector myPos, vector mySize)
+{
+       mod_active = 1; // required in each mod function that always shows something
+
+       HUD_Mod_CA_Draw(myPos, mySize, autocvar_hud_panel_modicons_freezetag_layout);
+}

diff --git a/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh b/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh
index 66eda36159686cbe168bdc68465386f65e34fa50..61d3b91e9416c0653b4d4ebe04a60456dee064b6 100644 (file)
--- a/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh
+++ b/qcsrc/common/gamemodes/gamemode/freezetag/freezetag.qh
@@ -6,6 +6,7 @@
 #endif
 
 #ifdef CSQC
+void HUD_Mod_FreezeTag(vector myPos, vector mySize);
 void HUD_Mod_FreezeTag_Export(int fh);
 #endif
 CLASS(FreezeTag, Gametype)
@@ -42,7 +43,7 @@ CLASS(FreezeTag, Gametype)
         returns(menu, _("Frag limit:"),      5,  100,  5, "fraglimit_override",        "g_freezetag_teams_override",   _("The amount of frags needed before the match will end"));
     }
 #ifdef CSQC
-    ATTRIB(FreezeTag, m_modicons, void(vector pos, vector mySize), HUD_Mod_CA);
+    ATTRIB(FreezeTag, m_modicons, void(vector pos, vector mySize), HUD_Mod_FreezeTag);
     ATTRIB(FreezeTag, m_modicons_export, void(int fh), HUD_Mod_FreezeTag_Export);
 #endif
     ATTRIB(FreezeTag, m_legacydefaults, string, "10 20 0");