From b204cec98e750b759b61a9d35cb648b9d3379f6c Mon Sep 17 00:00:00 2001 From: div0 Date: Thu, 26 Mar 2009 09:59:14 +0000 Subject: [PATCH] fix g_weapon_stay 2, and make it the default in the menu for weapon stay mutator git-svn-id: svn://svn.icculus.org/nexuiz/trunk@6304 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- .../menu/nexuiz/dialog_multiplayer_create_mutators.c | 2 +- data/qcsrc/menu/nexuiz/dialog_settings_effects.c | 3 +-- data/qcsrc/menu/nexuiz/dialog_settings_input.c | 4 +--- data/qcsrc/menu/nexuiz/dialog_settings_misc.c | 4 +--- data/qcsrc/server/miscfunctions.qc | 12 ++++++------ 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c index a6acd299c..0e8676684 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_create_mutators.c @@ -173,7 +173,7 @@ void fillNexuizMutatorsDialog(entity me) me.TR(me); me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_pinata", "Pinata")); me.TR(me); - me.TD(me, 1, 2, e = makeNexuizCheckBox(0, "g_weapon_stay", "Weapons stay")); + me.TD(me, 1, 2, e = makeNexuizCheckBoxEx(2, 0, "g_weapon_stay", "Weapons stay")); me.TR(me); s = makeNexuizSlider(10, 50, 1, "g_bloodloss"); me.TD(me, 1, 2, e = makeNexuizSliderCheckBox(0, 1, s, "Blood loss")); diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c index e80fa150b..8257f9f19 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_effects.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_effects.c @@ -139,8 +139,7 @@ void fillNexuizEffectsSettingsTab(entity me) me.TR(me); if(cvar("developer")) - me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_showsurfaces", "Show surfaces")); - e.yesValue = 3; + me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(3, 0, "r_showsurfaces", "Show surfaces")); me.TR(me); me.TD(me, 1, 1.5, e = makeNexuizCheckBox(0, "r_glsl_offsetmapping", "Offset mapping")); diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_input.c b/data/qcsrc/menu/nexuiz/dialog_settings_input.c index c7f567e5a..d29638568 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_input.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_input.c @@ -72,8 +72,6 @@ void fillNexuizInputSettingsTab(entity me) e.addValue(e, "Long", "2"); e.configureNexuizTextSliderValues(e); me.TR(me); - me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_showpressedkeys", "Show pressed keys")); - e.noValue = 0; - e.yesValue = 2; + me.TD(me, 1, 3, e = makeNexuizCheckBoxEx(2, 0, "cl_showpressedkeys", "Show pressed keys")); } #endif diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_misc.c b/data/qcsrc/menu/nexuiz/dialog_settings_misc.c index 417b976b8..49d606df2 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_misc.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_misc.c @@ -52,9 +52,7 @@ void fillNexuizMiscSettingsTab(entity me) me.TD(me, 1, 2.8/3, e = makeNexuizRadioButton(1, "showspeed", "5", "knots")); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 2.8, e = makeNexuizCheckBox(0, "showtopspeed", "Also show top speed")); - e.yesValue = -1; - e.noValue = 0; + me.TD(me, 1, 2.8, e = makeNexuizCheckBoxEx(-1, 0, "showtopspeed", "Also show top speed")); setDependent(e, "showspeed", 0.5, -0.5); me.TR(me); me.TR(me); diff --git a/data/qcsrc/server/miscfunctions.qc b/data/qcsrc/server/miscfunctions.qc index 9d8a51bb4..5147b4991 100644 --- a/data/qcsrc/server/miscfunctions.qc +++ b/data/qcsrc/server/miscfunctions.qc @@ -959,13 +959,13 @@ void readplayerstartcvars() if(g_weapon_stay == 2) { if(!start_ammo_shells) start_ammo_shells = g_pickup_shells; - if(!start_ammo_nails) start_ammo_shells = g_pickup_nails; - if(!start_ammo_cells) start_ammo_shells = g_pickup_cells; - if(!start_ammo_rockets) start_ammo_shells = g_pickup_rockets; + if(!start_ammo_nails) start_ammo_nails = g_pickup_nails; + if(!start_ammo_cells) start_ammo_cells = g_pickup_cells; + if(!start_ammo_rockets) start_ammo_rockets = g_pickup_rockets; if(!warmup_start_ammo_shells) warmup_start_ammo_shells = g_pickup_shells; - if(!warmup_start_ammo_nails) warmup_start_ammo_shells = g_pickup_nails; - if(!warmup_start_ammo_cells) warmup_start_ammo_shells = g_pickup_cells; - if(!warmup_start_ammo_rockets) warmup_start_ammo_shells = g_pickup_rockets; + if(!warmup_start_ammo_nails) warmup_start_ammo_nails = g_pickup_nails; + if(!warmup_start_ammo_cells) warmup_start_ammo_cells = g_pickup_cells; + if(!warmup_start_ammo_rockets) warmup_start_ammo_rockets = g_pickup_rockets; } start_ammo_shells = max(0, start_ammo_shells); -- 2.39.2