From c8397672a1a6a75755861911f8cac16b9fc1e65e Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 16 Jan 2008 17:53:53 +0000 Subject: [PATCH] added some more options, did some rearrangements and cleanups git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3152 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- .../nexuiz/dialog_multiplayer_create.c | 31 ++++++++++++++----- .../nexuiz/dialog_multiplayer_playersetup.c | 15 +++++---- .../nexuiz/dialog_settings_input.c | 10 +++++- .../menu-div0test/nexuiz/slider_resolution.c | 2 +- 4 files changed, 41 insertions(+), 17 deletions(-) diff --git a/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c b/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c index 12133003d..4c346282e 100644 --- a/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c +++ b/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_create.c @@ -65,9 +65,9 @@ void fillNexuizServerCreateTab(entity me) me.TR(me); me.TD(me, 1, 3, e = makeNexuizTextLabel(0, "Map list:")); me.TR(me); - me.TD(me, me.rows - 6, 3, e = makeNexuizMapList()); + me.TD(me, me.rows - 7, 3, e = makeNexuizMapList()); me.mapListBox = e; - me.gotoXY(me, me.rows - 2, 0); + me.gotoXY(me, me.rows - 3, 0); me.TDempty(me, 0.5); me.TD(me, 1, 1, e = makeNexuizButton("All", '0 0 0')); e.onClick = MapList_All; @@ -95,16 +95,27 @@ void fillNexuizServerCreateTab(entity me) 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, "Map voting:")); + me.TD(me, 1, 2, e = makeNexuizTextSlider("g_maplist_votable")); + e.addValue(e, "No voting", "0"); + e.addValue(e, "2 choices", "2"); + e.addValue(e, "3 choices", "3"); + e.addValue(e, "4 choices", "4"); + e.addValue(e, "5 choices", "5"); + e.addValue(e, "6 choices", "6"); + e.addValue(e, "7 choices", "7"); + e.configureNexuizTextSliderValues(e); + 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, "Number of bots:")); me.TD(me, 1, 2, makeNexuizSlider(0, 7, 1, "bot_number")); @@ -125,9 +136,15 @@ void fillNexuizServerCreateTab(entity me) e.addValue(e, "Godlike", "10"); e.configureNexuizTextSliderValues(e); setDependent(e, "bot_number", 0, -1); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.8, e = makeNexuizTextLabel(0, "Bot names:")); + me.TD(me, 1, 0.7, e = makeNexuizInputBox(1, "bot_prefix")); + me.TD(me, 1, 0.6, e = makeNexuizTextLabel(0.5, "Spellbinder")); + me.TD(me, 1, 0.7, e = makeNexuizInputBox(1, "bot_suffix")); me.TR(me); me.TR(me); - me.TD(me, 1, 1, e = makeNexuizButton("Mutators...", '0 0 0')); + me.TD(me, 1, 3, e = makeNexuizButton("Mutators...", '0 0 0')); e.onClick = DialogOpenButton_Click; e.onClickEntity = main.mutatorsDialog; main.mutatorsDialog.refilterEntity = me.mapListBox; diff --git a/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c b/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c index 2e6972307..c611ee2e4 100644 --- a/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c +++ b/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c @@ -19,7 +19,7 @@ entity makeNexuizPlayerSettingsTab() } void fillNexuizPlayerSettingsTab(entity me) { - entity e, pms; + entity e, pms, sl; float i, n; me.TR(me); @@ -56,14 +56,13 @@ void fillNexuizPlayerSettingsTab(entity me) me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Field of View:")); me.TD(me, 1, 2, e = makeNexuizSlider(60, 130, 1, "fov")); me.TR(me); + me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Zoom Factor:")); me.TD(me, 1, 2, e = makeNexuizSlider(2, 16, 0.5, "cl_zoomfactor")); me.TR(me); - me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Zoom Speed:")); - me.TD(me, 1, 2, e = makeNexuizSlider(1, 8, 0.5, "cl_zoomspeed")); - me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 2.8, e = makeNexuizSliderCheckBox(-1, 0, e, "Instant Zoom")); + sl = makeNexuizSlider(1, 8, 0.5, "cl_zoomspeed"); + me.TD(me, 1, 2.8, e = makeNexuizSliderCheckBox(-1, 0, sl, "Zoom speed:")); + me.TD(me, 1, 2, sl); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup")); me.TR(me); @@ -116,7 +115,7 @@ void fillNexuizPlayerSettingsTab(entity me) 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")); + 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"); @@ -128,6 +127,6 @@ void fillNexuizPlayerSettingsTab(entity me) 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;sendcvar cl_autoswitch;rate $cl_rate", 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 diff --git a/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c b/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c index 3f345fed1..35259c603 100644 --- a/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c +++ b/data/qcsrc/menu-div0test/nexuiz/dialog_settings_input.c @@ -50,10 +50,18 @@ void fillNexuizInputSettingsTab(entity me) me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(1.022, "m_pitch", "Invert mouse")); me.TR(me); - me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "joy_enable", "Use joystick input")); + if(cvar_defstring("joy_enable") != "") + me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "joy_enable", "Use joystick input")); + else if(cvar_defstring("joystick") != "") + me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "joystick", "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")); + me.TR(me); + if(cvar_defstring("vid_dgamouse") != "") + me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "vid_dgamouse", "Turn off OS mouse acceleration")); + else if(cvar_defstring("apple_mouse_noaccel") != "") + me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "vid_dgamouse", "Turn off OS mouse acceleration")); } #endif diff --git a/data/qcsrc/menu-div0test/nexuiz/slider_resolution.c b/data/qcsrc/menu-div0test/nexuiz/slider_resolution.c index 6d21a7529..bc3fbfa94 100644 --- a/data/qcsrc/menu-div0test/nexuiz/slider_resolution.c +++ b/data/qcsrc/menu-div0test/nexuiz/slider_resolution.c @@ -41,7 +41,7 @@ void configureNexuizResolutionSliderNexuizResolutionSlider(entity me) } void loadCvarsNexuizResolutionSlider(entity me) { - me.setValueFromIdentifier(me, strcat(cvar_string("vid_width"), " ", cvar_string("vid_height"))); + me.setValueFromIdentifier(me, strcat(cvar_string("vid_width"), " ", cvar_string("vid_height"), " ", cvar_string("vid_conwidth"), " ", cvar_string("vid_conheight"))); } void saveCvarsNexuizResolutionSlider(entity me) { -- 2.39.2