r3151 - in trunk/data: . maps qcsrc/menu-div0test qcsrc/menu-div0test/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Jan 16 03:33:23 EST 2008
Author: div0
Date: 2008-01-16 03:33:14 -0500 (Wed, 16 Jan 2008)
New Revision: 3151
Added:
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_misc.c
Removed:
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c
Modified:
trunk/data/default.cfg
trunk/data/maps/starship.bsp
trunk/data/qcsrc/menu-div0test/classes.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_effects.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c
trunk/data/qcsrc/menu-div0test/nexuiz/maplist.c
Log:
Lots of cvars added, and starship recompile with better performance. Thanks SavageX and esteel.
Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg 2008-01-15 22:48:09 UTC (rev 3150)
+++ trunk/data/default.cfg 2008-01-16 08:33:14 UTC (rev 3151)
@@ -853,3 +853,5 @@
// Q3A
set sv_q3acompat_machineshotgunswap 0 // settemp this in mapinfo for instant Q3A map conversion
+
+seta menu_maxplayers 8 // maxplayers value when the menu starts a game
Modified: trunk/data/maps/starship.bsp
===================================================================
(Binary files differ)
Modified: trunk/data/qcsrc/menu-div0test/classes.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/classes.c 2008-01-15 22:48:09 UTC (rev 3150)
+++ trunk/data/qcsrc/menu-div0test/classes.c 2008-01-16 08:33:14 UTC (rev 3151)
@@ -25,7 +25,7 @@
#include "nexuiz/dialog_settings.c"
#include "nexuiz/dialog_settings_video.c"
#include "nexuiz/dialog_settings_effects.c"
-#include "nexuiz/dialog_settings_audio.c"
+#include "nexuiz/dialog_settings_misc.c"
#include "nexuiz/dialog_multiplayer.c"
#include "nexuiz/dialog_multiplayer_playersetup.c"
#include "nexuiz/tabcontroller.c"
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c 2008-01-15 22:48:09 UTC (rev 3150)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c 2008-01-16 08:33:14 UTC (rev 3151)
@@ -95,6 +95,38 @@
me.TDempty(me, 0.2);
me.TD(me, 1, 2.8, e = makeNexuizSliderCheckBox(-1, 0, me.sliderFraglimit, "Use map specified default"));
me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Number of players:"));
+ me.TD(me, 1, 2, makeNexuizSlider(1, 32, 1, "menu_maxplayers"));
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Server UDP port:"));
+ me.TD(me, 1, 0.5, e = makeNexuizInputBox(0, "port"));
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "g_antilag", "AntiLag"));
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Number of bots:"));
+ me.TD(me, 1, 2, makeNexuizSlider(0, 7, 1, "bot_number"));
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 0.8, e = makeNexuizTextLabel(0, "Bot skill:"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("skill"));
+ e.addValue(e, "Botlike", "0");
+ e.addValue(e, "Beginner", "1");
+ e.addValue(e, "You will win", "2");
+ e.addValue(e, "You can win", "3");
+ e.addValue(e, "You might win", "4");
+ e.addValue(e, "Advanced", "5");
+ e.addValue(e, "Expert", "6");
+ e.addValue(e, "Pro", "7");
+ e.addValue(e, "Assassin", "8");
+ e.addValue(e, "Unhuman", "9");
+ e.addValue(e, "Godlike", "10");
+ e.configureNexuizTextSliderValues(e);
+ setDependent(e, "bot_number", 0, -1);
+ me.TR(me);
+ me.TR(me);
me.TD(me, 1, 1, e = makeNexuizButton("Mutators...", '0 0 0'));
e.onClick = DialogOpenButton_Click;
e.onClickEntity = main.mutatorsDialog;
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c 2008-01-15 22:48:09 UTC (rev 3150)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c 2008-01-16 08:33:14 UTC (rev 3151)
@@ -65,7 +65,9 @@
me.TDempty(me, 0.2);
me.TD(me, 1, 2.8, e = makeNexuizSliderCheckBox(-1, 0, e, "Instant Zoom"));
me.TR(me);
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup"));
me.TR(me);
+ me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Crosshair:"));
n = 10;
for(i = 1; i <= n; ++i)
@@ -97,8 +99,35 @@
me.TDempty(me, 0.2);
me.TD(me, 1, 2.8, e = makeNexuizCheckBox(1, "sbar_hudselector", "Use alternate HUD layout"));
setDependent(e, "viewsize", 0, 110);
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Show names:"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("cl_shownames"));
+ e.addValue(e, "Never", "0");
+ e.addValue(e, "Team games", "1");
+ e.addValue(e, "Always", "2");
+ e.configureNexuizTextSliderValues(e);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Show waypoints:"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("cl_hidewaypoints"));
+ e.addValue(e, "Players", "1");
+ e.addValue(e, "All", "0");
+ e.configureNexuizTextSliderValues(e);
+ 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.5, e = makeNexuizInputBox(0, "cl_port"));
me.gotoXY(me, me.rows - 1, 0);
- me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "color -1 -1;name $_cl_name;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed", COMMANDBUTTON_APPLY));
+ me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "color -1 -1;name $_cl_name;sendcvar cl_zoomfactor;sendcvar cl_zoomspeed;sendcvar cl_autoswitch;rate $cl_rate", COMMANDBUTTON_APPLY));
}
#endif
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c 2008-01-15 22:48:09 UTC (rev 3150)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c 2008-01-16 08:33:14 UTC (rev 3151)
@@ -18,7 +18,7 @@
me.TD(me, 1, 1, mc.makeTabButton(mc, "Input", makeNexuizInputSettingsTab()));
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, "Misc", makeNexuizMiscSettingsTab()));
me.TR(me);
me.TR(me);
me.TD(me, me.rows - 2, me.columns, mc);
Deleted: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c 2008-01-15 22:48:09 UTC (rev 3150)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c 2008-01-16 08:33:14 UTC (rev 3151)
@@ -1,73 +0,0 @@
-#ifdef INTERFACE
-CLASS(NexuizAudioSettingsTab) EXTENDS(NexuizTab)
- METHOD(NexuizAudioSettingsTab, fill, void(entity))
- ATTRIB(NexuizAudioSettingsTab, title, string, "Settings")
- ATTRIB(NexuizAudioSettingsTab, intendedWidth, float, 0.9)
- ATTRIB(NexuizAudioSettingsTab, rows, float, 15)
- ATTRIB(NexuizAudioSettingsTab, columns, float, 6.5)
-ENDCLASS(NexuizAudioSettingsTab)
-entity makeNexuizAudioSettingsTab();
-#endif
-
-#ifdef IMPLEMENTATION
-entity makeNexuizAudioSettingsTab()
-{
- entity me;
- me = spawnNexuizAudioSettingsTab();
- me.configureDialog(me);
- return me;
-}
-entity makeNexuizDemoListbox()
-{
- entity me;
- me = spawnListBox();
- me.configureListBox(me, 16, 0.1);
- return me;
-}
-void fillNexuizAudioSettingsTab(entity me)
-{
- entity e, s;
-
- me.TR(me);
- s = makeNexuizDecibelsSlider(-20, 0, 0.5, "bgmvolume");
- me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Music:"));
- me.TD(me, 1, 2, s);
- me.TR(me);
- s = makeNexuizDecibelsSlider(-20, 0, 0.5, "volume");
- me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Game:"));
- me.TD(me, 1, 2, s);
- me.TR(me);
- s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_staticvolume");
- me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Ambient:"));
- me.TD(me, 1, 2, s);
-
- me.gotoXY(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Frequency:"));
- me.TD(me, 1, 2, e = makeNexuizTextSlider("snd_speed"));
- e.addValue(e, "8 kHz", "8000");
- e.addValue(e, "11.025 kHz", "11025");
- e.addValue(e, "16 kHz", "16000");
- e.addValue(e, "22.05 kHz", "22050");
- e.addValue(e, "24 kHz", "24000");
- e.addValue(e, "32 kHz", "32000");
- e.addValue(e, "44.1 kHz", "44100");
- e.addValue(e, "48 kHz", "48000");
- e.configureNexuizTextSliderValues(e);
- me.TR(me);
- me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Channels:"));
- me.TD(me, 1, 2, e = makeNexuizSlider(1, 8, 1, "snd_channels"));
- me.TR(me);
- me.TDempty(me, 0.2);
- me.TD(me, 1, 2.8, e = makeNexuizCheckBox(1, "snd_swapstereo", "Swap Stereo"));
- me.TR(me);
- if(checkextension("DP_GECKO_SUPPORT"))
- {
- me.TD(me, 10, 15, e = spawnGecko() );
- e.configureBrowser( e, "www.google.de" );
- }
- me.TR(me);
-
- me.gotoXY(me, me.rows - 1, 0);
- me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "snd_restart", COMMANDBUTTON_APPLY));
-}
-#endif
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_effects.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_effects.c 2008-01-15 22:48:09 UTC (rev 3150)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_effects.c 2008-01-16 08:33:14 UTC (rev 3151)
@@ -97,12 +97,13 @@
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_decals", "Decals"));
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Gibs:"));
- n = 3 + !!cvar("developer");
- me.TD(me, 1, 2 / n, e = makeNexuizRadioButton(2, "cl_nogibs", "0", "Lots"));
- me.TD(me, 1, 2 / n, e = makeNexuizRadioButton(2, "cl_nogibs", "0.5", "Many"));
- me.TD(me, 1, 2 / n, e = makeNexuizRadioButton(2, "cl_nogibs", "0.75", "Few"));
- if(cvar("developer"))
- me.TD(me, 1, 2 / n, e = makeNexuizRadioButton(2, "cl_nogibs", "1", "German"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("cl_nogibs"));
+ if(cvar("developer"))
+ e.addValue(e, "German", "1");
+ e.addValue(e, "Few", "0.75");
+ e.addValue(e, "Many", "0.5");
+ e.addValue(e, "Lots", "1");
+ e.configureNexuizTextSliderValues(e);
me.TR(me);
@@ -166,10 +167,16 @@
e.addValue(e, "Insane", "2");
e.configureNexuizTextSliderValues(e);
setDependent(e, "r_water", 1, 1);
+
+ me.TR(me);
me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Damage view kick:"));
+ me.TD(me, 1, 2, e = makeNexuizSlider(0, 0.5, 0.05, "v_kicktime"));
me.TR(me);
+
+ me.TR(me);
if(cvar("developer"))
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_showsurfaces", "Show surfaces"));
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c 2008-01-15 22:48:09 UTC (rev 3150)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c 2008-01-16 08:33:14 UTC (rev 3151)
@@ -53,5 +53,7 @@
me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "joy_enable", "Use joystick input"));
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"));
}
#endif
Copied: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_misc.c (from rev 3149, trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_audio.c)
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_misc.c (rev 0)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings_misc.c 2008-01-16 08:33:14 UTC (rev 3151)
@@ -0,0 +1,88 @@
+#ifdef INTERFACE
+CLASS(NexuizMiscSettingsTab) EXTENDS(NexuizTab)
+ METHOD(NexuizMiscSettingsTab, fill, void(entity))
+ ATTRIB(NexuizMiscSettingsTab, title, string, "Settings")
+ ATTRIB(NexuizMiscSettingsTab, intendedWidth, float, 0.9)
+ ATTRIB(NexuizMiscSettingsTab, rows, float, 15)
+ ATTRIB(NexuizMiscSettingsTab, columns, float, 6.5)
+ENDCLASS(NexuizMiscSettingsTab)
+entity makeNexuizMiscSettingsTab();
+#endif
+
+#ifdef IMPLEMENTATION
+entity makeNexuizMiscSettingsTab()
+{
+ entity me;
+ me = spawnNexuizMiscSettingsTab();
+ me.configureDialog(me);
+ return me;
+}
+entity makeNexuizDemoListbox()
+{
+ entity me;
+ me = spawnListBox();
+ me.configureListBox(me, 16, 0.1);
+ return me;
+}
+void fillNexuizMiscSettingsTab(entity me)
+{
+ entity e, s;
+
+ me.TR(me);
+ s = makeNexuizDecibelsSlider(-20, 0, 0.5, "bgmvolume");
+ me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Music:"));
+ me.TD(me, 1, 2, s);
+ me.TR(me);
+ s = makeNexuizDecibelsSlider(-20, 0, 0.5, "volume");
+ me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Game:"));
+ me.TD(me, 1, 2, s);
+ me.TR(me);
+ s = makeNexuizDecibelsSlider(-20, 0, 0.5, "snd_staticvolume");
+ me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1000000, 1, s, "Ambient:"));
+ me.TD(me, 1, 2, s);
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Frequency:"));
+ me.TD(me, 1, 2, e = makeNexuizTextSlider("snd_speed"));
+ e.addValue(e, "8 kHz", "8000");
+ e.addValue(e, "11.025 kHz", "11025");
+ e.addValue(e, "16 kHz", "16000");
+ e.addValue(e, "22.05 kHz", "22050");
+ e.addValue(e, "24 kHz", "24000");
+ e.addValue(e, "32 kHz", "32000");
+ e.addValue(e, "44.1 kHz", "44100");
+ e.addValue(e, "48 kHz", "48000");
+ e.configureNexuizTextSliderValues(e);
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Channels:"));
+ me.TD(me, 1, 2, e = makeNexuizSlider(1, 8, 1, "snd_channels"));
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "snd_swapstereo", "Swap Stereo"));
+
+ me.gotoXY(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autodemo", "Demo recording"));
+ me.TR(me);
+ me.TR(me);
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "showtime", "Show current time"));
+ me.TR(me);
+ me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "showdate", "Show current date"));
+ 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 = makeNexuizTextLabel(0, "Speedmeter:"));
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "0", "Off"));
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "1", "in/s"));
+ me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "2", "m/s"));
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ 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.gotoXY(me, me.rows - 1, 0);
+ me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "snd_restart", COMMANDBUTTON_APPLY));
+}
+#endif
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/maplist.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/maplist.c 2008-01-15 22:48:09 UTC (rev 3150)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/maplist.c 2008-01-16 08:33:14 UTC (rev 3151)
@@ -244,7 +244,7 @@
return;
if(MapInfo_CheckMap(m))
{
- localcmd("\ng_maplist_shufflenow\n");
+ localcmd("\ndisconnect\nwait\nmaxplayers $menu_maxplayers\ng_maplist_shufflenow\n");
MapInfo_LoadMap(m);
}
else
More information about the nexuiz-commits
mailing list