* Added "Use Medkit" option

* Removed antitox from infopanes
* retabbed the .txt files

5 files changed, 67 insertions, 46 deletions

diff --git a/ui/hud.txt b/ui/hud.txt
index 608b2568..02d7fa19 100644
--- a/ui/hud.txt
+++ b/ui/hud.txt
@@ -1,11 +1,11 @@
 // hud menu defs
 // 
 {
-	loadMenu { "ui/tremulous_human_hud.menu" }
-	loadMenu { "ui/tremulous_alien_builder_hud.menu" }
-	loadMenu { "ui/tremulous_alien_general_hud.menu" }
-	loadMenu { "ui/tremulous_default_hud.menu" }
+  loadMenu { "ui/tremulous_human_hud.menu" }
+  loadMenu { "ui/tremulous_alien_builder_hud.menu" }
+  loadMenu { "ui/tremulous_alien_general_hud.menu" }
+  loadMenu { "ui/tremulous_default_hud.menu" }
   
-	loadMenu { "ui/teamscore.menu" }
+  loadMenu { "ui/teamscore.menu" }
   loadMenu { "ui/loading.menu" }
 }
diff --git a/ui/ingame.txt b/ui/ingame.txt
index 41207b99..860fce10 100644
--- a/ui/ingame.txt
+++ b/ui/ingame.txt
@@ -1,11 +1,11 @@
 // menu defs
 // 
-{	
- 	loadMenu { "ui/ingame.menu" }
-	loadMenu { "ui/ingame_about.menu" }
-	loadMenu { "ui/ingame_options.menu" }
-	loadMenu { "ui/ingame_vote.menu" }
-	loadMenu { "ui/ingame_callvote.menu" }
-	loadMenu { "ui/ingame_callteamvote.menu" }
-	loadMenu { "ui/ingame_leave.menu" }
+{ 
+  loadMenu { "ui/ingame.menu" }
+  loadMenu { "ui/ingame_about.menu" }
+  loadMenu { "ui/ingame_options.menu" }
+  loadMenu { "ui/ingame_vote.menu" }
+  loadMenu { "ui/ingame_callvote.menu" }
+  loadMenu { "ui/ingame_callteamvote.menu" }
+  loadMenu { "ui/ingame_leave.menu" }
 }
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 62b4a83e..5902e582 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -242,8 +242,8 @@
       name game
       group optionsGrp
       type ITEM_TYPE_YESNO
-      text "Disable Build Warnings:"
-      cvar "cg_disableBuildWarnings"
+      text "Disable Warning Dialogs:"
+      cvar "cg_disableWarningDialogs"
       rect 90 195 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 128 
@@ -783,7 +783,7 @@
       type ITEM_TYPE_BIND
       text "Primary Attack:"
       cvar "+attack"
-      rect 96 100 192 15
+      rect 96 90 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 115 192 15
+      rect 96 105 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 130 192 15
+      rect 96 120 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 145 192 15
+      rect 96 135 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 160 192 15
+      rect 96 150 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -888,7 +888,7 @@
       type ITEM_TYPE_BIND
       text "Reload:"
       cvar "reload"
-      rect 96 175 192 15
+      rect 96 165 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
@@ -909,7 +909,28 @@
       type ITEM_TYPE_BIND
       text "Buy Ammo:"
       cvar "buy ammo"
-      rect 96 190 192 15
+      rect 96 180 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 "Use Medkit:"
+      cvar "itemact medkit"
+      rect 96 195 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 90
       maxPaintChars 20
diff --git a/ui/menus.txt b/ui/menus.txt
index a76fa910..cc6f73c7 100644
--- a/ui/menus.txt
+++ b/ui/menus.txt
@@ -1,19 +1,19 @@
 // menu defs
 // 
-{	
-	loadMenu { "ui/main.menu" }
- 	loadMenu { "ui/joinserver.menu" }
+{ 
+  loadMenu { "ui/main.menu" }
+  loadMenu { "ui/joinserver.menu" }
   loadMenu { "ui/punkbuster.menu" }
- 	loadMenu { "ui/createserver.menu" }
- 	loadMenu { "ui/mod.menu" }
-	loadMenu { "ui/credit.menu" }
-	loadMenu { "ui/connect.menu" }
-	loadMenu { "ui/password.menu" }
-	loadMenu { "ui/quit.menu" }
-	loadMenu { "ui/addfilter.menu" }
-	loadMenu { "ui/error.menu" }
-	loadMenu { "ui/serverinfo.menu" }
-	loadMenu { "ui/findplayer.menu" }
-	loadMenu { "ui/quitcredit.menu" }
-	loadMenu { "ui/createfavorite.menu" }
+  loadMenu { "ui/createserver.menu" }
+  loadMenu { "ui/mod.menu" }
+  loadMenu { "ui/credit.menu" }
+  loadMenu { "ui/connect.menu" }
+  loadMenu { "ui/password.menu" }
+  loadMenu { "ui/quit.menu" }
+  loadMenu { "ui/addfilter.menu" }
+  loadMenu { "ui/error.menu" }
+  loadMenu { "ui/serverinfo.menu" }
+  loadMenu { "ui/findplayer.menu" }
+  loadMenu { "ui/quitcredit.menu" }
+  loadMenu { "ui/createfavorite.menu" }
 }
diff --git a/ui/tremulous.txt b/ui/tremulous.txt
index 1a9ec55c..6bcc08f1 100644
--- a/ui/tremulous.txt
+++ b/ui/tremulous.txt
@@ -1,19 +1,19 @@
 // menu defs
 // 
-{	
-	loadMenu { "ui/tremulous_teamselect.menu" }
+{ 
+  loadMenu { "ui/tremulous_teamselect.menu" }
   loadMenu { "ui/tremulous_alienclass.menu" }
-	loadMenu { "ui/tremulous_humanitem.menu" }
-	
+  loadMenu { "ui/tremulous_humanitem.menu" }
+  
   loadMenu { "ui/tremulous_alienbuild.menu" }
-	loadMenu { "ui/tremulous_humanbuild.menu" }
+  loadMenu { "ui/tremulous_humanbuild.menu" }
+  
+  loadMenu { "ui/tremulous_humanarmoury.menu" }
   
-	loadMenu { "ui/tremulous_humanarmoury.menu" }
-	
   loadMenu { "ui/tremulous_humandialogs.menu" }
-	loadMenu { "ui/tremulous_aliendialogs.menu" }
+  loadMenu { "ui/tremulous_aliendialogs.menu" }
   
-	loadMenu { "ui/tremulous_alienupgrade.menu" }
+  loadMenu { "ui/tremulous_alienupgrade.menu" }
 
   loadMenu { "ui/ptrc.menu" }
 }