r5601 - in trunk/data/qcsrc/menu: . nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Jan 18 09:28:46 EST 2009
Author: m0rfar
Date: 2009-01-18 09:28:46 -0500 (Sun, 18 Jan 2009)
New Revision: 5601
Added:
trunk/data/qcsrc/menu/nexuiz/dialog_settings_network.c
Modified:
trunk/data/qcsrc/menu/classes.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c
trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
Log:
Added a Network tab in Settings. With the most common Network options.
There is space for more options here, so more can be added in the future.
Modified: trunk/data/qcsrc/menu/classes.c
===================================================================
--- trunk/data/qcsrc/menu/classes.c 2009-01-17 23:50:38 UTC (rev 5600)
+++ trunk/data/qcsrc/menu/classes.c 2009-01-18 14:28:46 UTC (rev 5601)
@@ -28,6 +28,7 @@
#include "nexuiz/dialog_settings_video.c"
#include "nexuiz/dialog_settings_effects.c"
#include "nexuiz/dialog_settings_audio.c"
+#include "nexuiz/dialog_settings_network.c"
#include "nexuiz/dialog_settings_misc.c"
#include "nexuiz/dialog_multiplayer.c"
#include "nexuiz/dialog_multiplayer_playersetup.c"
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings.c 2009-01-17 23:50:38 UTC (rev 5600)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings.c 2009-01-18 14:28:46 UTC (rev 5601)
@@ -19,6 +19,7 @@
me.TD(me, 1, 1, mc.makeTabButton(mc, "Video", makeNexuizVideoSettingsTab()));
me.TD(me, 1, 1, mc.makeTabButton(mc, "Effects", makeNexuizEffectsSettingsTab()));
me.TD(me, 1, 1, mc.makeTabButton(mc, "Audio", makeNexuizAudioSettingsTab()));
+ me.TD(me, 1, 1, mc.makeTabButton(mc, "Network", makeNexuizNetworkSettingsTab()));
me.TD(me, 1, 1, mc.makeTabButton(mc, "Misc", makeNexuizMiscSettingsTab()));
me.TR(me);
me.TR(me);
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c 2009-01-17 23:50:38 UTC (rev 5600)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_input.c 2009-01-18 14:28:46 UTC (rev 5601)
@@ -58,9 +58,11 @@
else if(cvar_type("joystick") & CVAR_TYPEFLAG_ENGINE)
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "joystick", "Use joystick input"));
me.TR(me);
+ if(cvar_type("vid_dgamouse") & CVAR_TYPEFLAG_ENGINE)
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "vid_dgamouse", "Turn off OS mouse acceleration"));
+ else if(cvar_type("apple_mouse_noaccel") & CVAR_TYPEFLAG_ENGINE)
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "apple_mouse_noaccel", "Turn off OS mouse acceleration"));
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_movement", "Client-side movement prediction"));
- me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "con_closeontoggleconsole", "\"enter console\" also closes"));
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Show binds:"));
@@ -69,10 +71,5 @@
e.addValue(e, "Short", "1");
e.addValue(e, "Long", "2");
e.configureNexuizTextSliderValues(e);
- me.TR(me);
- if(cvar_type("vid_dgamouse") & CVAR_TYPEFLAG_ENGINE)
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "vid_dgamouse", "Turn off OS mouse acceleration"));
- else if(cvar_type("apple_mouse_noaccel") & CVAR_TYPEFLAG_ENGINE)
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "apple_mouse_noaccel", "Turn off OS mouse acceleration"));
}
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c 2009-01-17 23:50:38 UTC (rev 5600)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_misc.c 2009-01-18 14:28:46 UTC (rev 5601)
@@ -25,12 +25,12 @@
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Menu skins:"));
me.TR(me);
- me.TD(me, me.rows - 2, 3, sk = makeNexuizSkinList());
+ me.TD(me, me.rows - 2, 3, sk = makeNexuizSkinList());
me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, 3, e = makeNexuizButton("Apply immediately", '0 0 0'));
e.onClick = SetSkin_Click;
e.onClickEntity = sk;
-
+
me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "showtime", "Show current time"));
me.TR(me);
@@ -38,8 +38,6 @@
me.TR(me);
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "showfps", "Show frames per second"));
me.TR(me);
- me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "shownetgraph", "Show netgraph"));
- me.TR(me);
me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Speedmeter:"));
me.TR(me);
me.TDempty(me, 0.2);
@@ -51,18 +49,5 @@
me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "3", "km/h"));
me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "4", "mph"));
me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "5", "knots"));
- me.TR(me);
- me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Network speed:"));
- me.TD(me, 1, 2, e = makeNexuizTextSlider("_cl_rate"));
- 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, "Broadband", "25000");
- e.configureNexuizTextSliderValues(e);
- me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Client UDP port:"));
- me.TD(me, 1, 0.64, e = makeNexuizInputBox(0, "cl_port"));
}
#endif
Added: trunk/data/qcsrc/menu/nexuiz/dialog_settings_network.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_settings_network.c (rev 0)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_settings_network.c 2009-01-18 14:28:46 UTC (rev 5601)
@@ -0,0 +1,60 @@
+#ifdef INTERFACE
+CLASS(NexuizNetworkSettingsTab) EXTENDS(NexuizTab)
+ METHOD(NexuizNetworkSettingsTab, fill, void(entity))
+ ATTRIB(NexuizNetworkSettingsTab, title, string, "Audio")
+ ATTRIB(NexuizNetworkSettingsTab, intendedWidth, float, 0.9)
+ ATTRIB(NexuizNetworkSettingsTab, rows, float, 17)
+ ATTRIB(NexuizNetworkSettingsTab, columns, float, 6.5)
+ENDCLASS(NexuizNetworkSettingsTab)
+entity makeNexuizNetworkSettingsTab();
+#endif
+
+#ifdef IMPLEMENTATION
+entity makeNexuizNetworkSettingsTab()
+{
+ entity me;
+ me = spawnNexuizNetworkSettingsTab();
+ me.configureDialog(me);
+ return me;
+}
+
+void fillNexuizNetworkSettingsTab(entity me)
+{
+ entity e;
+
+ me.TR(me);
+ me.TD(me, 1, 4, e = makeNexuizCheckBox(0, "cl_movement", "Client-side movement prediction"));
+ me.TR(me);
+ me.TD(me, 1, 4, e = makeNexuizCheckBox(1, "cl_nolerp", "Network update smoothing"));
+ me.TR(me);
+ me.TD(me, 1, 4, e = makeNexuizCheckBox(0, "shownetgraph", "Show netgraph"));
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Network speed:"));
+ me.TD(me, 1, 2.5, e = makeNexuizTextSlider("_cl_rate"));
+ 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, "Broadband", "25000");
+ e.configureNexuizTextSliderValues(e);
+ me.TR(me);
+ me.TD(me, 1, 1.5, e = makeNexuizTextLabel(0, "Outgoing packets / sec:"));
+ me.TD(me, 1, 2.5, e = makeNexuizSlider(20, 120, 1, "cl_netfps"));
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 4, e = makeNexuizTextLabel(0, "HTTP downloads:"));
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 1.3, e = makeNexuizTextLabel(0, "Max downloads:"));
+ me.TD(me, 1, 2.5, e = makeNexuizSlider(1, 5, 1, "cl_curl_maxdownloads"));
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 1.3, e = makeNexuizTextLabel(0, "Max speed (KB/s):"));
+ me.TD(me, 1, 2.5, e = makeNexuizSlider(10, 1500, 10, "cl_curl_maxspeed"));
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Client UDP port:"));
+ me.TD(me, 1, 0.64, e = makeNexuizInputBox(0, "cl_port"));
+}
+#endif
More information about the nexuiz-commits
mailing list