ARGH, that really was a STUPID bug.

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / util.qc

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 3a73e226463fd20874e20b77fa1d071bc7174cff..e5259cc8e73f4b646727e36d8e7926c24cc8fb2b 100644 (file)
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -280,7 +280,7 @@ void URI_Get_Callback(float id, float status, string data)
        }
        else
        {
-               print(sprintf(_("Received HTTP request data for an invalid id %d.\n"), id));
+               print(sprintf("Received HTTP request data for an invalid id %d.\n", id));
        }
 }
 
@@ -352,55 +352,8 @@ void UpdateNotification_URI_Get_Callback(float id, float status, string data)
 
 // END OF URI SYSTEM ////////////////////////////////////////////////////////
 
-float preMenuInit()
-{
-       vector sz;
-       vector boxA, boxB;
-
-       MapInfo_Cache_Create();
-       MapInfo_Enumerate();
-       if(!MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1))
-       {
-               draw_reset_cropped();
-
-               sz = eX * 0.025 + eY * 0.025 * (draw_scale_x / draw_scale_y);
-               draw_CenterText('0.5 0.5 0' - 1.25 * sz_y * eY, _("Autogenerating mapinfo for newly added maps..."), sz, '1 1 1', 1, 0);
-
-               boxA = '0.05 0.5 0' + 0.25 * sz_y * eY;
-               boxB = '0.95 0.5 0' + 1.25 * sz_y * eY;
-               draw_Fill(boxA, boxB - boxA, '1 1 1', 1);
-               
-               boxA += sz * 0.1;
-               boxB -= sz * 0.1;
-               draw_Fill(boxA, boxB - boxA, '0.1 0.1 0.1', 1);
-
-               boxB_x = boxA_x * (1 - MapInfo_progress) + boxB_x * MapInfo_progress;
-               draw_Fill(boxA, boxB - boxA, '0 0 1', 1);
-
-               return FALSE;
-       }
-       return TRUE;
-}
-
-string campaign_name_previous;
-float campaign_won_previous;
-#ifdef WATERMARK
-var string autocvar_menu_watermark = WATERMARK();
-#else
-var string autocvar_menu_watermark = "";
-#endif
-void postMenuDraw()
-{
-       if(autocvar_menu_watermark != "")
-       {
-               vector fs = '48 48 0';
-               draw_CenterText('0.5 0.1 0', sprintf(_("^1%s TEST BUILD"), autocvar_menu_watermark), globalToBoxSize('32 32 0', draw_scale), '1 1 1', 0.05, 1);
-       }
-}
-void preMenuDraw()
+void updateCheck()
 {
-       vector fs, sz, line, mid;
-
        if(cvar("menu_updatecheck"))
        {
                if(!_Nex_ExtResponseSystem_Queried)
@@ -475,6 +428,60 @@ void preMenuDraw()
                        _Nex_ExtResponseSystem_PacksStep = 2;
        }
 
+}
+
+float preMenuInit()
+{
+       vector sz;
+       vector boxA, boxB;
+
+       updateCheck();
+
+       MapInfo_Cache_Create();
+       MapInfo_Enumerate();
+       if(!MapInfo_FilterGametype(MAPINFO_TYPE_ALL, 0, 0, 0, 1))
+       {
+               draw_reset_cropped();
+
+               sz = eX * 0.025 + eY * 0.025 * (draw_scale_x / draw_scale_y);
+               draw_CenterText('0.5 0.5 0' - 1.25 * sz_y * eY, _("Autogenerating mapinfo for newly added maps..."), sz, '1 1 1', 1, 0);
+
+               boxA = '0.05 0.5 0' + 0.25 * sz_y * eY;
+               boxB = '0.95 0.5 0' + 1.25 * sz_y * eY;
+               draw_Fill(boxA, boxB - boxA, '1 1 1', 1);
+               
+               boxA += sz * 0.1;
+               boxB -= sz * 0.1;
+               draw_Fill(boxA, boxB - boxA, '0.1 0.1 0.1', 1);
+
+               boxB_x = boxA_x * (1 - MapInfo_progress) + boxB_x * MapInfo_progress;
+               draw_Fill(boxA, boxB - boxA, '0 0 1', 1);
+
+               return FALSE;
+       }
+       return TRUE;
+}
+
+string campaign_name_previous;
+float campaign_won_previous;
+#ifdef WATERMARK
+var string autocvar_menu_watermark = WATERMARK;
+#else
+var string autocvar_menu_watermark = "";
+#endif
+void postMenuDraw()
+{
+       if(autocvar_menu_watermark != "")
+       {
+               draw_CenterText('0.5 0.1 0', sprintf(_("^1%s TEST BUILD"), autocvar_menu_watermark), globalToBoxSize('32 32 0', draw_scale), '1 1 1', 0.05, 1);
+       }
+}
+void preMenuDraw()
+{
+       vector fs, sz = '0 0 0', line, mid;
+
+       updateCheck();
+
        if(_Nex_ExtResponseSystem_UpdateTo != "")
        {
                // TODO rather turn this into a dialog
@@ -602,7 +609,6 @@ float updateCompression()
        GAMETYPE(MAPINFO_TYPE_ONSLAUGHT) \
        GAMETYPE(MAPINFO_TYPE_RACE) \
        GAMETYPE(MAPINFO_TYPE_CTS) \
-       GAMETYPE(MAPINFO_TYPE_RUNEMATCH) \
        GAMETYPE(MAPINFO_TYPE_TEAM_DEATHMATCH) \
        /* nothing */
 
@@ -614,6 +620,8 @@ float GameType_GetID(float cnt)
        #define GAMETYPE(id) if(i++ == cnt) return id;
        GAMETYPES
        #undef GAMETYPE
+
+       unused_float = i;
        
        return 0;
 }