[nexuiz-commits] r8190 - trunk/data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-10-30 14:29:12 -0400 (Fri, 30 Oct 2009)
New Revision: 8190

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c
   trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c
Log:
menu rearrangements by Samual


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c	2009-10-26 20:44:01 UTC (rev 8189)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c	2009-10-30 18:29:12 UTC (rev 8190)
@@ -5,8 +5,8 @@
 	METHOD(NexuizWeaponsDialog, showNotify, void(entity))
 	ATTRIB(NexuizWeaponsDialog, title, string, "Weapon settings")
 	ATTRIB(NexuizWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)
-	ATTRIB(NexuizWeaponsDialog, intendedWidth, float, 0.35)
-	ATTRIB(NexuizWeaponsDialog, rows, float, 16)
+	ATTRIB(NexuizWeaponsDialog, intendedWidth, float, 0.5)
+	ATTRIB(NexuizWeaponsDialog, rows, float, 17)
 	ATTRIB(NexuizWeaponsDialog, columns, float, 4)
 	ATTRIB(NexuizWeaponsDialog, weaponsList, entity, NULL)
 ENDCLASS(NexuizWeaponsDialog)
@@ -24,34 +24,30 @@
 void fillNexuizWeaponsDialog(entity me)
 {
 	entity e;
-	float h0, h;
 
-	h = me.rows - 7;
-	
 	me.TR(me);
 		me.TD(me, 1, 4, makeNexuizTextLabel(0, "Weapon priority list:"));
 	me.TR(me);
-		h0 = me.currentRow;
-		me.TD(me, h, 3, e = me.weaponsList = makeNexuizWeaponsList());
-	me.gotoRC(me, h0 + h / 2 - 1, 3);
+		me.TD(me, 9, 4, e = me.weaponsList = makeNexuizWeaponsList());
+	me.gotoRC(me, 10, 0);
+		me.TDempty(me, 1);
 		me.TD(me, 1, 1, e = makeNexuizButton("Up", '0 0 0'));
 			e.onClick = WeaponsList_MoveUp_Click;
 			e.onClickEntity = me.weaponsList;
-	me.gotoRC(me, h0 + h / 2, 3);
 		me.TD(me, 1, 1, e = makeNexuizButton("Down", '0 0 0'));
 			e.onClick = WeaponsList_MoveDown_Click;
 			e.onClickEntity = me.weaponsList;
-	me.gotoRC(me, h0 + h, 0);
+	me.gotoRC(me, 11, 0);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_weaponpriority_useforcycling", "Use priority list 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.TDempty(me, 0.5);
-		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "cl_gunalign", "4", "Left align"));
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 1, e = makeNexuizRadioButton(1, "cl_gunalign", "4", "Left align"));
 			setDependent(e, "r_drawviewmodel", 1, 1);
-		me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "cl_gunalign", "3", "Right align"));
+		me.TD(me, 1, 1, e = makeNexuizRadioButton(1, "cl_gunalign", "3", "Right align"));
 			setDependent(e, "r_drawviewmodel", 1, 1);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Flip view horizontally"));
@@ -60,5 +56,4 @@
 			e.onClick = Dialog_Close;
 			e.onClickEntity = me;
 }
-
 #endif

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c	2009-10-26 20:44:01 UTC (rev 8189)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_singleplayer.c	2009-10-30 18:29:12 UTC (rev 8190)
@@ -66,7 +66,7 @@
 		me.TD(me, 1, me.columns - 2, lblTitle = makeNexuizTextLabel(0.5, "???"));
 		me.TD(me, 1, 1, btnNext = makeNexuizButton(">>", '0 0 0'));
 	me.TR(me);
-		me.TD(me, me.rows - 6, me.columns, me.campaignBox = makeNexuizCampaignList());
+		me.TD(me, me.rows - 5, me.columns, me.campaignBox = makeNexuizCampaignList());
 			btnPrev.onClick = MultiCampaign_Prev;
 			btnPrev.onClickEntity = me.campaignBox;
 			btnNext.onClick = MultiCampaign_Next;