From: bones_was_here <bones_was_here@xonotic.au>
Date: Mon, 19 Jun 2023 16:21:57 +0000 (+1000)
Subject: Hotfix for menu BS
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fheads%2Fbones_was_here%2Fmenu_hotfix_0.8.5;p=xonotic%2Fxonotic-data.pk3dir.git

Hotfix for menu BS

see:
https://gitlab.com/xonotic/xonotic-data.pk3dir/-/commit/e1907c7dac807e4ccb0bef3a029568a1237d88c7
https://gitlab.com/xonotic/xonotic-data.pk3dir/-/commit/af68e02202d3fc9fba725cc1f5f227f364b25d3e
---

diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index f98a8de88..9c6b70286 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -492,16 +492,11 @@ void updateCheck()
 
 }
 
-bool show_propermenu = false;
-
 float preMenuInit()
 {
 	vector sz;
 	vector boxA, boxB;
 
-	if(random() < 0.1)
-		show_propermenu = true;
-
 	updateCheck();
 
 	MapInfo_Cache_Create();
@@ -546,11 +541,8 @@ void preMenuDraw()
 		fs = ((1/draw_scale.x) * eX + (1/draw_scale.y) * eY) * 12;
 		line = eY * fs.y;
 		string l1, l2;
-		if(show_propermenu)
-			l1 = sprintf("Jeff pay 4 new weapons for %s", _Nex_ExtResponseSystem_UpdateTo);
-		else
-			l1 = sprintf(_("Update to %s now!"), _Nex_ExtResponseSystem_UpdateTo);
-		l2 = "http://www.xonotic.org/";
+		l1 = sprintf(_("Update to %s now!"), _Nex_ExtResponseSystem_UpdateTo);
+		l2 = "https://xonotic.org/download";
 		if(_Nex_ExtResponseSystem_UpdateToURL)
 			l2 = _Nex_ExtResponseSystem_UpdateToURL;
 
diff --git a/weapons.cfg b/weapons.cfg
new file mode 100644
index 000000000..ae561b005
--- /dev/null
+++ b/weapons.cfg
@@ -0,0 +1,3 @@
+// placeholder: 0.8.2 had this file, 0.8.5 doesn't
+// problem: af68e02202d3fc9fba725cc1f5f227f364b25d3e
+// fix: e1907c7dac807e4ccb0bef3a029568a1237d88c7