* Added "buy ammo" bind to options

* Set default focus to the listbox for many of the trem menus

8 files changed, 36 insertions, 14 deletions

diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index fb5c66c3..801dca38 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -783,7 +783,7 @@
       type ITEM_TYPE_BIND
       text "Primary Attack:"
       cvar "+attack"
-      rect 96 115 192 15
+      rect 96 100 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -804,7 +804,7 @@
       type ITEM_TYPE_BIND
       text "Secondary Attack:"
       cvar "+button5"
-      rect 96 130 192 15
+      rect 96 115 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -825,7 +825,7 @@
       type ITEM_TYPE_BIND
       text "Previous Upgrade:"
       cvar "weapprev"
-      rect 96 145 192 15
+      rect 96 130 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -846,7 +846,7 @@
       type ITEM_TYPE_BIND
       text "Next Upgrade:"
       cvar "weapnext"
-      rect 96 160 192 15
+      rect 96 145 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -867,7 +867,7 @@
       type ITEM_TYPE_BIND
       text "Activate Upgrade:"
       cvar "+button2"
-      rect 96 175 192 15
+      rect 96 160 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -888,6 +888,27 @@
       type ITEM_TYPE_BIND
       text "Reload:"
       cvar "reload"
+      rect 96 175 192 15
+      textalign ITEM_ALIGN_RIGHT
+      textalignx 90
+      maxPaintChars 20
+      textaligny 12
+      textscale .25       
+      forecolor 1 1 1 1
+      visible 0 
+      action
+      {
+        play "sound/misc/menu1.wav"; 
+      }
+    }
+    
+    itemDef
+    {
+      name upgrades
+      group optionsGrp
+      type ITEM_TYPE_BIND
+      text "Buy Ammo:"
+      cvar "buy ammo"
       rect 96 190 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
@@ -1100,7 +1121,7 @@
       name misc
       group optionsGrp
       type ITEM_TYPE_BIND
-      text "Target Chat (FIXME):"
+      text "Target Chat:"
       cvar "messagemode3"
       rect 96 200 192 15
       textalign ITEM_ALIGN_RIGHT
@@ -1121,7 +1142,7 @@
       name misc
       group optionsGrp
       type ITEM_TYPE_BIND
-      text "Attack Chat (FIXME):"
+      text "Attack Chat:"
       cvar "messagemode4"
       rect 96 215 192 15
       textalign ITEM_ALIGN_RIGHT
diff --git a/ui/tremulous_alienbuild.menu b/ui/tremulous_alienbuild.menu
index dad85367..6ea6c0d1 100644
--- a/ui/tremulous_alienbuild.menu
+++ b/ui/tremulous_alienbuild.menu
@@ -11,7 +11,7 @@
     focusColor 1 .75 0 1
     style 1
     popup
-    onOpen { uiScript LoadAlienBuilds }
+    onOpen { uiScript LoadAlienBuilds; setFocus list }
 
     itemDef
     {
diff --git a/ui/tremulous_alienclass.menu b/ui/tremulous_alienclass.menu
index 4eb10d8e..0d8cf5eb 100644
--- a/ui/tremulous_alienclass.menu
+++ b/ui/tremulous_alienclass.menu
@@ -11,7 +11,7 @@
     focusColor 1 .75 0 1
     style 1
     popup
-    onOpen { uiScript LoadAlienClasses }
+    onOpen { uiScript LoadAlienClasses; setFocus list }
 
     itemDef
     {
diff --git a/ui/tremulous_alienupgrade.menu b/ui/tremulous_alienupgrade.menu
index 13afdece..5dc67318 100644
--- a/ui/tremulous_alienupgrade.menu
+++ b/ui/tremulous_alienupgrade.menu
@@ -11,7 +11,7 @@
     focusColor 1 .75 0 1
     style 1
     popup
-    onOpen { uiScript LoadAlienUpgrades }
+    onOpen { uiScript LoadAlienUpgrades; setFocus list }
 
     itemDef
     {
diff --git a/ui/tremulous_humanarmoury.menu b/ui/tremulous_humanarmoury.menu
index 901417c2..74514fa2 100644
--- a/ui/tremulous_humanarmoury.menu
+++ b/ui/tremulous_humanarmoury.menu
@@ -14,7 +14,8 @@
     onOpen
     {
       uiScript LoadHumanArmouryBuys;
-      uiScript LoadHumanArmourySells
+      uiScript LoadHumanArmourySells;
+      setFocus list
     }
 
     itemDef
diff --git a/ui/tremulous_humanbuild.menu b/ui/tremulous_humanbuild.menu
index 8da14c87..a44b84bf 100644
--- a/ui/tremulous_humanbuild.menu
+++ b/ui/tremulous_humanbuild.menu
@@ -11,7 +11,7 @@
     focusColor 1 .75 0 1
     style 1
     popup
-    onOpen { uiScript LoadHumanBuilds }
+    onOpen { uiScript LoadHumanBuilds; setFocus list }
 
     itemDef
     {
diff --git a/ui/tremulous_humanitem.menu b/ui/tremulous_humanitem.menu
index b886b2f1..b8374ea9 100644
--- a/ui/tremulous_humanitem.menu
+++ b/ui/tremulous_humanitem.menu
@@ -11,7 +11,7 @@
     focusColor 1 .75 0 1
     style 1
     popup
-    onOpen { uiScript LoadHumanItems }
+    onOpen { uiScript LoadHumanItems; setFocus list }
 
     itemDef
     {
diff --git a/ui/tremulous_teamselect.menu b/ui/tremulous_teamselect.menu
index dc88fd25..72c1dffc 100644
--- a/ui/tremulous_teamselect.menu
+++ b/ui/tremulous_teamselect.menu
@@ -11,7 +11,7 @@
     focusColor 1 .75 0 1
     style 1
     popup
-    onOpen { uiScript LoadTeams }
+    onOpen { uiScript LoadTeams; setFocus list }
 
     itemDef
     {