From de00b31120b23ae0787f25a66d9ddf7f2cc55e46 Mon Sep 17 00:00:00 2001 From: div0 Date: Wed, 19 Nov 2008 13:05:29 +0000 Subject: [PATCH] MirceaKitsune's next changes git-svn-id: svn://svn.icculus.org/nexuiz/trunk@5059 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- .../menu/nexuiz/dialog_multiplayer_playersetup.c | 6 +++--- .../nexuiz/dialog_multiplayer_playersetup_weapons.c | 12 +++++++----- data/qcsrc/menu/nexuiz/dialog_settings_input.c | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c index 92be2d93a..11b2b047d 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c @@ -78,15 +78,15 @@ void fillNexuizPlayerSettingsTab(entity me) me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(-1, 1, sl, "Zoom speed:")); me.TD(me, 1, 2, sl); me.TR(me); - sl = makeNexuizSlider(0.45, 0.75, 0.05, "cl_bobcycle"); + sl = makeNexuizSlider(0.45, 0.75, 0.01, "cl_bobcycle"); me.TD(me, 1, 1, e = makeNexuizSliderCheckBox(0, 1, sl, "View bobbing:")); me.TD(me, 1, 2, sl); me.TR(me); - me.TD(me, 1, 1, e = makeNexuizButton("Weapon settings...", '0 0 0')); + me.TD(me, 1, 1.5, e = makeNexuizButton("Weapon settings...", '0 0 0')); e.onClick = DialogOpenButton_Click; e.onClickEntity = main.weaponsDialog; - me.TD(me, 1, 2, e0 = makeNexuizTextLabel(0, string_null)); + me.TD(me, 1, 1.5, e0 = makeNexuizTextLabel(0, string_null)); e0.textEntity = main.weaponsDialog; e0.allowCut = 1; me.TR(me); diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c index 24bc05f62..6e23b7113 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c @@ -6,7 +6,7 @@ CLASS(NexuizWeaponsDialog) EXTENDS(NexuizDialog) ATTRIB(NexuizWeaponsDialog, title, string, "Weapon settings") ATTRIB(NexuizWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS) ATTRIB(NexuizWeaponsDialog, intendedWidth, float, 0.35) - ATTRIB(NexuizWeaponsDialog, rows, float, 12) + ATTRIB(NexuizWeaponsDialog, rows, float, 13) ATTRIB(NexuizWeaponsDialog, columns, float, 4) ATTRIB(NexuizWeaponsDialog, weaponsList, entity, NULL) ENDCLASS(NexuizWeaponsDialog) @@ -27,19 +27,21 @@ void fillNexuizWeaponsDialog(entity me) me.TR(me); me.TD(me, 1, 4, makeNexuizTextLabel(0, "Weapon priority list:")); me.TR(me); - me.TD(me, me.rows - 3, 3, e = me.weaponsList = makeNexuizWeaponsList()); - me.gotoRC(me, (me.rows - 1) / 2 - 1, 3); + me.TD(me, me.rows - 5, 3, e = me.weaponsList = makeNexuizWeaponsList()); + me.gotoRC(me, (me.rows - 5) / 2, 3); me.TD(me, 1, 1, e = makeNexuizButton("Up", '0 0 0')); e.onClick = WeaponsList_MoveUp_Click; e.onClickEntity = me.weaponsList; - me.gotoRC(me, (me.rows - 1) / 2, 3); + me.gotoRC(me, (me.rows - 5) / 2 + 1, 3); me.TD(me, 1, 1, e = makeNexuizButton("Down", '0 0 0')); e.onClick = WeaponsList_MoveDown_Click; e.onClickEntity = me.weaponsList; - me.gotoRC(me, me.rows - 3, 0); + me.gotoRC(me, me.rows - 4, 0); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_weaponpriority_useforcycling", "Use for weapon cycling")); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup")); + me.TR(me); + me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model")); me.TR(me); me.TD(me, 1, me.columns, e = makeNexuizButton("OK", '0 0 0')); e.onClick = Dialog_Close; diff --git a/data/qcsrc/menu/nexuiz/dialog_settings_input.c b/data/qcsrc/menu/nexuiz/dialog_settings_input.c index b215d25cb..307414408 100644 --- a/data/qcsrc/menu/nexuiz/dialog_settings_input.c +++ b/data/qcsrc/menu/nexuiz/dialog_settings_input.c @@ -57,6 +57,7 @@ void fillNexuizInputSettingsTab(entity me) me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "joy_enable", "Use joystick input")); else if(cvar_type("joystick") & CVAR_TYPEFLAG_ENGINE) me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "joystick", "Use joystick input")); + me.TR(me); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_movement", "Client-side movement prediction")); me.TR(me); -- 2.39.2