X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_multiplayer_playersetup_weapons.c;h=fa3549154b0e807eddc63391b04154c1baa9db65;hb=786db02b0c9aa618c581b7c3fe7392ad114797d8;hp=d20a6483bb425e4f9735c6fbf8dc7d24b317221e;hpb=fbe0ecf4de0561cb63ad83f29702ac71d681dd76;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
index d20a6483b..fa3549154 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c
@@ -5,9 +5,9 @@ CLASS(XonoticWeaponsDialog) EXTENDS(XonoticDialog)
 	METHOD(XonoticWeaponsDialog, showNotify, void(entity))
 	ATTRIB(XonoticWeaponsDialog, title, string, _("Weapon settings"))
 	ATTRIB(XonoticWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)
-	ATTRIB(XonoticWeaponsDialog, intendedWidth, float, 0.4)
-	ATTRIB(XonoticWeaponsDialog, rows, float, 17)
-	ATTRIB(XonoticWeaponsDialog, columns, float, 3)
+	ATTRIB(XonoticWeaponsDialog, intendedWidth, float, 0.7)
+	ATTRIB(XonoticWeaponsDialog, rows, float, 12)
+	ATTRIB(XonoticWeaponsDialog, columns, float, 5.2)
 	ATTRIB(XonoticWeaponsDialog, weaponsList, entity, NULL)
 ENDCLASS(XonoticWeaponsDialog)
 #endif
@@ -26,32 +26,51 @@ void XonoticWeaponsDialog_fill(entity me)
 	entity e;
 
 	me.TR(me);
-		me.TD(me, 1, 3, makeXonoticTextLabel(0, _("Weapon priority list:")));
+		me.TD(me, 1, 2, makeXonoticTextLabel(0, _("Weapon priority list:")));
 	me.TR(me);
-		me.TD(me, 9, 3, e = me.weaponsList = makeXonoticWeaponsList());
-	me.gotoRC(me, 10, 0);
-		me.TDempty(me, 0.5);
+		me.TD(me, 8, 2, e = me.weaponsList = makeXonoticWeaponsList());
+	me.gotoRC(me, 9, 0);
 		me.TD(me, 1, 1, e = makeXonoticButton(_("Up"), '0 0 0'));
 			e.onClick = WeaponsList_MoveUp_Click;
 			e.onClickEntity = me.weaponsList;
 		me.TD(me, 1, 1, e = makeXonoticButton(_("Down"), '0 0 0'));
 			e.onClick = WeaponsList_MoveDown_Click;
 			e.onClickEntity = me.weaponsList;
-	me.TR(me);
+			
+	me.gotoRC(me, 0, 2.2); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_weaponpriority_useforcycling", _("Use priority list for weapon cycling")));
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_autoswitch", _("Auto switch weapons on pickup")));
+	me.TR(me);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_drawviewmodel", _("Draw 1st person weapon model")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.4, e = makeXonoticRadioButton(1, "cl_gunalign", "4", _("Left align")));
+		me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "cl_gunalign", "4", _("Left align")));
+			setDependent(e, "r_drawviewmodel", 1, 1);
+		me.TD(me, 1, 0.9, e = makeXonoticRadioButton(1, "cl_gunalign", "1", _("Center")));
 			setDependent(e, "r_drawviewmodel", 1, 1);
-		me.TD(me, 1, 1.4, e = makeXonoticRadioButton(1, "cl_gunalign", "3", _("Right align")));
+		me.TD(me, 1, 1.0, e = makeXonoticRadioButton(1, "cl_gunalign", "3", _("Right align")));
 			setDependent(e, "r_drawviewmodel", 1, 1);
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_flipped", _("Flip view horizontally")));
 	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_followmodel", _("Gun model swaying")));
+		makeMulti(e, "cl_leanmodel");
+		setDependent(e, "r_drawviewmodel", 1, 1);
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_bobmodel", _("Gun model bobbing")));
+		setDependent(e, "r_drawviewmodel", 1, 1);
+	//me.TR(me);
+	//me.TR(me);
+	//	me.TDempty(me, 0.2);
+	//	me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("VWMDL^Scale"))));
+	//	setDependent(e, "r_drawviewmodel", 1, 1);
+	//	me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 2, 0.1, "cl_viewmodel_scale"));
+	//	setDependent(e, "r_drawviewmodel", 1, 1);
+			
+	me.gotoRC(me, me.rows - 1, 0);
 		me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;