From 8b99984ae036ca5573c5e5830273cf31378fe9b7 Mon Sep 17 00:00:00 2001
From: Tim Angus <tim@ngus.net>
Date: Wed, 25 Sep 2002 04:08:47 +0000
Subject: * Loading menu altered for progress bar border thickness *
 tremulous_human_hud.menu is CVS is currently cruft - waiting for Jex *
 Crosshair selection removed from options menu

---
 ui/ingame_options.menu      | 19 ++-----------------
 ui/loading.menu             | 18 +++++++++++-------
 ui/tremulous_human_hud.menu | 15 ++++++++++-----
 3 files changed, 23 insertions(+), 29 deletions(-)

(limited to 'ui')

diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index 88c3cbf2..76bfaa05 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -181,21 +181,6 @@
       visible 0 
     }
 
-    itemDef
-    {
-      name game				
-      group optionsGrp
-      text "Crosshair:"
-      ownerdraw UI_CROSSHAIR
-      rect 218 167 20 17
-      textalign ITEM_ALIGN_RIGHT
-      textalignx 0 
-      textaligny 17
-      textscale .25        
-      forecolor 1 1 1 1
-      visible 0 
-    }
-
     itemDef
     {
       name game				
@@ -203,7 +188,7 @@
       type ITEM_TYPE_YESNO
       text "Auto Wallwalk Pitching:"
       cvar "cg_wwFollow"
-      rect 90 185 192 15
+      rect 90 165 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 128
       textaligny 12
@@ -220,7 +205,7 @@
       text "Wallwalking Speed:"
       cvarfloat "cg_wwSmoothTime" 300 0 1000
       cvarFloatList { "Medium" 300 "Fast" 150 "Instant" 0 "Slow" 600 }
-      rect 90 200 192 15
+      rect 90 180 192 15
       textalign ITEM_ALIGN_RIGHT
       textalignx 128 
       textaligny 12
diff --git a/ui/loading.menu b/ui/loading.menu
index f5b5ca8c..1559216d 100644
--- a/ui/loading.menu
+++ b/ui/loading.menu
@@ -78,11 +78,12 @@
       rect 20 300 380 30
       visible 1
       decoration
-      forecolor 0.3 1 1 0.8
+      forecolor 0.0 0.8 1 1
       ownerdraw CG_LOAD_MEDIA
       align ITEM_ALIGN_CENTER
       textstyle ITEM_TEXTSTYLE_NEON
       textscale 0.5
+      special 1.0
     }
     
     itemDef
@@ -94,7 +95,7 @@
       align ITEM_ALIGN_RIGHT
       textaligny 28
       textalignx 0
-      forecolor 0.3 1 1 0.8
+      forecolor 0.0 0.8 1 1
       visible 1 
       decoration 
       ownerdraw CG_LOAD_MEDIA_LABEL
@@ -106,11 +107,12 @@
       rect 20 340 380 30
       visible 1
       decoration
-      forecolor 0.3 1 1 0.8
+      forecolor 0.0 0.8 1 1
       ownerdraw CG_LOAD_BUILDABLES
       align ITEM_ALIGN_CENTER
       textstyle ITEM_TEXTSTYLE_NEON
       textscale 0.5
+      special 1.0
     }
     
     itemDef
@@ -122,7 +124,7 @@
       align ITEM_ALIGN_RIGHT
       textaligny 28
       textalignx 0
-      forecolor 0.3 1 1 0.8
+      forecolor 0.0 0.8 1 1
       visible 1 
       decoration 
       ownerdraw CG_LOAD_BUILDABLES_LABEL
@@ -134,11 +136,12 @@
       rect 20 380 380 30
       visible 1
       decoration
-      forecolor 0.3 1 1 0.8
+      forecolor 0.0 0.8 1 1
       ownerdraw CG_LOAD_CHARMODEL
       align ITEM_ALIGN_CENTER
       textstyle ITEM_TEXTSTYLE_NEON
       textscale 0.5
+      special 1.0
     }
     
     itemDef
@@ -150,7 +153,7 @@
       align ITEM_ALIGN_RIGHT
       textaligny 28
       textalignx 0
-      forecolor 0.3 1 1 0.8
+      forecolor 0.0 0.8 1 1
       visible 1 
       decoration 
       ownerdraw CG_LOAD_CHARMODEL_LABEL
@@ -162,11 +165,12 @@
       rect 20 420 600 30
       visible 1
       decoration
-      forecolor 0.3 1 1 0.8
+      forecolor 0.0 0.8 1 1
       ownerdraw CG_LOAD_OVERALL
       align ITEM_ALIGN_CENTER
       textstyle ITEM_TEXTSTYLE_NEON
       textscale 0.5
+      special 1.0
     }
   }
 }
diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index 82c8bef0..62ccd5a7 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -128,10 +128,13 @@
     itemDef
     {
       name "s"
-      rect 121 398 17 68
+      rect 121 348 50 5
       visible 1
       decoration
-      forecolor 1 1 0 1
+      forecolor 0 0.8 1 1
+      textScale 0.0
+      special 0.0
+      align ITEM_ALIGN_RIGHT
       ownerdraw CG_PLAYER_STAMINA
     }
     
@@ -258,11 +261,13 @@
     itemDef
     {
       name "healthok"
-      rect 0 410 108 44
+      rect 10 410 108 10
       visible 1
       decoration
-      forecolor 1 1 0 1
-      ownerdraw CG_PLAYER_HEALTH
+      forecolor 0 0.8 1 1
+      textScale 0.0
+      special 0.0
+      ownerdraw CG_PLAYER_HEALTH_BAR
     }
 
     // SELECT
-- 
cgit