* Lucifer cannon projectile a little bigger with charge

* Sitting on a booster won't make it blink the warning bolt (SS_BOOSTEDWARNING), also made the warning fade
* Lucifer Cannon repeat rates fixed
* G_Damage() wont deal damage to dead entities
* Maybe fixed the buildable killed with shotgun won't show dying anim bug
* Attacked hives won't attack back when the OM is dead
* The monstrous hive bounding boxes shrunk to something reasonable
* Tesla Generator muzzle offset to the ball part, now fires over turrets
* HUDs can make vertical charge bars
* Human charge bar no longer overlaps scanner
* "There are no spawns remaining"
Changes to trample attack:
* No longer deals locational damage (wtf?)
* Charge "holding" restored
* Hit repeat rate limited to 50 ms
Changes to health cross icons:
* Inspired by Techhead, made new icons (sorry, yours didn't look so good in game :-\ )
* Icons fade from one to another
* Switched SS_HEALING_2X and SS_HEALING_ACTIVE meaning for Humans -- glows when on medi station, special icon for medkit
* Poisoned icon for humans (Techhead's idea)

3 files changed, 11 insertions, 67 deletions

diff --git a/ui/menudef.h b/ui/menudef.h
index 18432272..6b9705e1 100644
--- a/ui/menudef.h
+++ b/ui/menudef.h
@@ -175,9 +175,7 @@
 #define UI_HBUILDINFOPANE                 74
 #define UI_HELPINFOPANE                   75
 
-#define CG_PLAYER_HEALTH_CROSS2           76
-#define CG_PLAYER_HEALTH_CROSS3           77
-#define CG_PLAYER_CHARGE_BAR_BG           78
-#define CG_PLAYER_CHARGE_BAR              79
+#define CG_PLAYER_CHARGE_BAR_BG           76
+#define CG_PLAYER_CHARGE_BAR              77
 
 #endif
diff --git a/ui/tremulous_alien_common_hud.h b/ui/tremulous_alien_common_hud.h
index d4e8a4ce..466ed184 100644
--- a/ui/tremulous_alien_common_hud.h
+++ b/ui/tremulous_alien_common_hud.h
@@ -92,41 +92,14 @@ itemDef
 itemDef
 {
   name "cross"
-  rect 152.5 420.5 20 20
+  rect 150 417.5 25 25
   aspectBias ALIGN_LEFT
   visible MENU_TRUE
   decoration
   forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
-  background "ui/assets/neutral/cross.tga"
   ownerdraw CG_PLAYER_HEALTH_CROSS
 }
 
-//CROSS 2X
-itemDef
-{
-  name "cross"
-  rect 152.5 420.5 20 20
-  aspectBias ALIGN_LEFT
-  visible MENU_TRUE
-  decoration
-  forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
-  background "ui/assets/neutral/cross2.tga"
-  ownerdraw CG_PLAYER_HEALTH_CROSS2
-}
-
-//CROSS 3X
-itemDef
-{
-  name "cross"
-  rect 152.5 420.5 20 20
-  aspectBias ALIGN_LEFT
-  visible MENU_TRUE
-  decoration
-  forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
-  background "ui/assets/neutral/cross3.tga"
-  ownerdraw CG_PLAYER_HEALTH_CROSS3
-}
-
 //LEFT RING
 itemDef
 {
@@ -207,7 +180,7 @@ itemDef
 itemDef
 {
   name "organs"
-  rect 570.5 415.95 15 15
+  rect 570 416 15 15
   aspectBias ALIGN_RIGHT
   visible MENU_TRUE
   decoration
@@ -235,7 +208,7 @@ itemDef
   decoration
   forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
   ownerdraw CG_PLAYER_CHARGE_BAR
-  background "ui/assets/neutral/charge_cap.tga"
+  background "ui/assets/neutral/charge_cap_h.tga"
 }
 
 //CHARGE BAR BG
@@ -248,6 +221,6 @@ itemDef
   decoration
   forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
   ownerdraw CG_PLAYER_CHARGE_BAR_BG
-  background "ui/assets/neutral/charge_bg.tga"
+  background "ui/assets/neutral/charge_bg_h.tga"
 }
 
diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index 5847ceaf..e38a25ce 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -121,41 +121,14 @@
     itemDef
     {
       name "cross"
-      rect 135 427.5 20 20
+      rect 132.5 425 25 25
       aspectBias ALIGN_LEFT
       visible MENU_TRUE
       decoration
       forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
-      background "ui/assets/neutral/cross.tga"
       ownerdraw CG_PLAYER_HEALTH_CROSS
     }
 
-    //CROSS 2X
-    itemDef
-    {
-      name "cross"
-      rect 135 427.5 20 20
-      aspectBias ALIGN_LEFT
-      visible MENU_TRUE
-      decoration
-      forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
-      background "ui/assets/neutral/cross2.tga"
-      ownerdraw CG_PLAYER_HEALTH_CROSS2
-    }
-
-    //CROSS 3X
-    itemDef
-    {
-      name "cross"
-      rect 135 427.5 20 20
-      aspectBias ALIGN_LEFT
-      visible MENU_TRUE
-      decoration
-      forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
-      background "ui/assets/neutral/cross3.tga"
-      ownerdraw CG_PLAYER_HEALTH_CROSS3
-    }
-
     //STAMINA 1
     itemDef
     {
@@ -349,26 +322,26 @@
     itemDef
     {
       name "charge"
-      rect 292 404 56 8
+      rect 510 384 56 8
       aspectBias ALIGN_CENTER
       visible MENU_TRUE
       decoration
       forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.5
       ownerdraw CG_PLAYER_CHARGE_BAR
-      background "ui/assets/neutral/charge_cap.tga"
+      background "ui/assets/neutral/charge_cap_h.tga"
     }
 
     //CHARGE BAR BG
     itemDef
     {
       name "chargebg"
-      rect 288 400 64 16
+      rect 506 380 64 16
       aspectBias ALIGN_CENTER
       visible MENU_TRUE
       decoration
       forecolor COMMON_HUD_R COMMON_HUD_G COMMON_HUD_B 0.25
       ownerdraw CG_PLAYER_CHARGE_BAR_BG
-      background "ui/assets/neutral/charge_bg.tga"
+      background "ui/assets/neutral/charge_bg_h.tga"
     }
 
     //SELECTED