X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_misc.qc;h=1033919f4f7a2e3ce2490c7444512c2670a20b65;hb=f50c4ad7ca132deae396750254aa4572da48b61a;hp=ede6543e7d983cfed14ee19587da465bd7411b06;hpb=c6ebaefab2aca7df4648dac3ccdd4b52de45d0ed;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qc b/qcsrc/menu/xonotic/dialog_settings_misc.qc
index ede6543e7..1033919f4 100644
--- a/qcsrc/menu/xonotic/dialog_settings_misc.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc
@@ -9,6 +9,8 @@
 #include "mainwindow.qh"
 
 #define ADDVALUE_FPS(i) e.addValue(e, strzone(sprintf(_("%d fps"), i)), #i)
+#define ADDVALUE_SPEED_KB(i) e.addValue(e, strzone(sprintf(_("%d KB/s"), i)), #i)
+#define ADDVALUE_SPEED_MB(i, j) e.addValue(e, strzone(sprintf(_("%d MB/s"), i)), #j)
 entity makeXonoticMiscSettingsTab()
 {
 	entity me;
@@ -34,14 +36,10 @@ void XonoticMiscSettingsTab_fill(entity me)
 			_("Specify your network speed")));
 			e.addValue(e, _("56k"), "4000");
 			e.addValue(e, _("ISDN"), "7000");
-			e.addValue(e, _("Slow ADSL"), "15000");
-			e.addValue(e, _("Fast ADSL"), "20000");
+			e.addValue(e, _("Slow ADSL"), "20000");
+			e.addValue(e, _("Fast ADSL"), "40000");
 			e.addValue(e, _("Broadband"), "66666");
 			e.configureXonoticTextSliderValues(e);
-	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Input packets/s:")));
-		me.TD(me, 1, 2, e = makeXonoticSlider_T(20, 100, 5, "cl_netfps",
-			_("How many input packets to send to the server each second")));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Server queries/s:")));
 		me.TD(me, 1, 2, e = makeXonoticSlider(20, 100, 10, "net_slist_queriespersecond"));
@@ -51,11 +49,18 @@ void XonoticMiscSettingsTab_fill(entity me)
 		me.TD(me, 1, 2, e = makeXonoticSlider_T(1, 5, 1, "cl_curl_maxdownloads",
 			_("Maximum number of concurrent HTTP/FTP downloads")));
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Speed (kB/s):")));
-		me.TD(me, 1, 2, e = makeXonoticSlider_T(10, 2000, 50, "cl_curl_maxspeed",
-			_("Maximum download speed")));
-	me.TR(me);
-		if(cvar("developer"))
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Download speed:")));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_curl_maxspeed"));
+		ADDVALUE_SPEED_KB(50);
+		ADDVALUE_SPEED_KB(100);
+		ADDVALUE_SPEED_KB(300);
+		ADDVALUE_SPEED_KB(500);
+		ADDVALUE_SPEED_MB(1, 1000);
+		ADDVALUE_SPEED_MB(2, 2000);
+		e.addValue(e, strzone(_("Unlimited")), "0");
+		e.configureXonoticTextSliderValues(e);
+	me.TR(me);
+		if(cvar("developer") > 0)
 		{
 			me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Local latency:")));
 			me.TD(me, 1, 2, e = makeXonoticSlider(0, 1000, 25, "cl_netlocalping"));
@@ -78,15 +83,13 @@ void XonoticMiscSettingsTab_fill(entity me)
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Maximum:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxfps"));
 			ADDVALUE_FPS(30);
-			ADDVALUE_FPS(40);
-			ADDVALUE_FPS(50);
 			ADDVALUE_FPS(60);
-			ADDVALUE_FPS(70);
-			ADDVALUE_FPS(80);
 			ADDVALUE_FPS(100);
 			ADDVALUE_FPS(125);
 			ADDVALUE_FPS(150);
 			ADDVALUE_FPS(200);
+			ADDVALUE_FPS(250);
+			ADDVALUE_FPS(400);
 			e.addValue(e, ZCTX(_("MAXFPS^Unlimited")), "0");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
@@ -94,14 +97,13 @@ void XonoticMiscSettingsTab_fill(entity me)
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_minfps"));
 			e.addValue(e, ZCTX(_("TRGT^Disabled")), "0");
 			ADDVALUE_FPS(30);
-			ADDVALUE_FPS(40);
-			ADDVALUE_FPS(50);
 			ADDVALUE_FPS(60);
-			ADDVALUE_FPS(80);
 			ADDVALUE_FPS(100);
 			ADDVALUE_FPS(125);
 			ADDVALUE_FPS(150);
 			ADDVALUE_FPS(200);
+			ADDVALUE_FPS(250);
+			ADDVALUE_FPS(400);
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Idle limit:")));