From 4259eb656c7d315b648c22c1430813468fc7f699 Mon Sep 17 00:00:00 2001 From: MirceaKitsune Date: Tue, 1 Mar 2011 00:18:41 +0200 Subject: [PATCH] Some menu tweaks --- data/defaultVoretournament.cfg | 6 +++--- data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c | 9 +++++++-- .../voret/dialog_multiplayer_playersetup_weapons.c | 10 +++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/data/defaultVoretournament.cfg b/data/defaultVoretournament.cfg index 6f81e071..6fa6750a 100644 --- a/data/defaultVoretournament.cfg +++ b/data/defaultVoretournament.cfg @@ -108,11 +108,11 @@ _cl_name "Player" _cl_playermodel models/player/vixen.zym _cl_playerskin 0 crosshair 1 -seta crosshair_pickup 1 "crosshair grows then shrinks back when picking something up" -seta crosshair_pickup_speed 4 "speed of pickup effect" +seta crosshair_pickup 1 "crosshair grows then shrinks back when picking up an item" +seta crosshair_pickup_speed 4 "speed of the crosshair pickup effect" seta crosshair_ring_alpha 0.5 "alpha of the crosshair ammo ring" seta crosshair_ring_size 3 "size of the crosshair ammo ring" -seta crosshair_swallowindicator 1 "when enabled, the crosshair will turn into a symbol to indicate when you can swallow an enemy or team mate" +seta crosshair_swallowindicator 1 "when enabled, the crosshair will turn into a symbol to indicate you can swallow an enemy or team mate" seta crosshair_swallowindicator_size 0.5 "size of the crosshair swallow indicator" seta crosshair_swallowindicator_color_red 1 "red amount for the crosshair swallow indicator" seta crosshair_swallowindicator_color_green 1 "green amount for the crosshair swallow indicator" diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c index 95033997..1f04be53 100644 --- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c +++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup.c @@ -93,10 +93,15 @@ void fillVoretPlayerSettingsTab(entity me) me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Damage kick:")); me.TD(me, 1, 2, e = makeVoretSlider(0, 0.5, 0.05, "v_kicktime")); me.TR(me); - sl = makeVoretSlider(0.45, 0.75, 0.01, "cl_bobcycle"); + sl = makeVoretSlider(0.45, 0.75, 0.05, "cl_bobcycle"); me.TD(me, 1, 1, e = makeVoretSliderCheckBox(0, 1, sl, "View bobbing:")); me.TD(me, 1, 2, sl); - + makeMulti(e, "cl_bob2cycle"); + makeMulti(sl, "cl_bob2cycle"); + me.TR(me); + sl = makeVoretSlider(0.5, 8, 0.5, "cl_rollangle"); + me.TD(me, 1, 1, e = makeVoretSliderCheckBox(0, 1, sl, "View rolling:")); + me.TD(me, 1, 2, sl); me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Zoom Factor:")); diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c index b07127a9..61f016ea 100644 --- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c +++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c @@ -6,7 +6,7 @@ CLASS(VoretWeaponsDialog) EXTENDS(VoretDialog) ATTRIB(VoretWeaponsDialog, title, string, "Weapon & Crosshair settings") ATTRIB(VoretWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS) ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.5) - ATTRIB(VoretWeaponsDialog, rows, float, 17) + ATTRIB(VoretWeaponsDialog, rows, float, 18) ATTRIB(VoretWeaponsDialog, columns, float, 4) ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL) ENDCLASS(VoretWeaponsDialog) @@ -81,19 +81,22 @@ void fillVoretWeaponsDialog(entity me) me.TDempty(me, 0.3); me.TD(me, 1, 1.25, e = makeVoretTextLabel(0, "Crosshair Blue:")); me.TD(me, 1, 2.5, e = makeVoretSlider(0, 1, 0.01, "crosshair_color_blue")); + me.TR(me); me.TR(me); me.TDempty(me, 0.3); me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Hit test:")); me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "0", "None")); me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1", "TrueAim")); me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1.25", "Enemies")); + me.TR(me); + me.TDempty(me, 0.3); + me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_pickup", "Crosshair pickup effect")); me.TR(me); me.TDempty(me, 0.3); me.TD(me, 1, 2, e = makeVoretCheckBoxEx(0.5, 0, "crosshair_ring_alpha", "Crosshair ammo ring")); me.TR(me); me.TDempty(me, 0.3); me.TD(me, 1, 2, e = makeVoretCheckBox(0, "crosshair_swallowindicator", "Crosshair swallow indicator")); - me.TR(me); me.TR(me); me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon model & view settings:")); @@ -106,9 +109,6 @@ void fillVoretWeaponsDialog(entity me) setDependent(e, "r_drawviewmodel", 1, 1); me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_gunalign", "3", "Right align")); setDependent(e, "r_drawviewmodel", 1, 1); - me.TR(me); - me.TDempty(me, 0.3); - me.TD(me, 1, 3, e = makeVoretCheckBox(0, "v_flipped", "Flip view horizontally")); me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0')); -- 2.39.2