summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/ingame_options.menu22
-rw-r--r--ui/menudef.h2
-rw-r--r--ui/tremulous_alien_common_hud.h27
-rw-r--r--ui/tremulous_human_hud.menu26
4 files changed, 76 insertions, 1 deletions
diff --git a/ui/ingame_options.menu b/ui/ingame_options.menu
index ac08995b..e4b68229 100644
--- a/ui/ingame_options.menu
+++ b/ui/ingame_options.menu
@@ -13,7 +13,7 @@
#define TOPBUTT_H 30
#define CONTENT_X BORDER
-#define CONTENT_Y ((2*BORDER)+TOPBUTT_H)
+#define CONTENT_Y ((1.5*BORDER)+TOPBUTT_H)
#define CONTENT_W (W-(2*BORDER))
#define CONTENT_OFF (0-(CONTENT_W/2))
@@ -402,6 +402,26 @@
}
}
+ itemDef
+ {
+ name game
+ group optionsGrp
+ type ITEM_TYPE_YESNO
+ text "Show Charge Bar:"
+ cvar "cg_drawChargeBar"
+ rect CONTENT_X (CONTENT_Y+(13*ELEM_H)) CONTENT_W ELEM_H
+ textalign ALIGN_RIGHT
+ textvalign VALIGN_CENTER
+ textalignx CONTENT_OFF
+ textscale .25
+ forecolor 1 1 1 1
+ visible MENU_FALSE
+ action
+ {
+ play "sound/misc/menu1.wav";
+ }
+ }
+
//////// CONTROLS
//Controls menu
diff --git a/ui/menudef.h b/ui/menudef.h
index 99adf158..19ffe196 100644
--- a/ui/menudef.h
+++ b/ui/menudef.h
@@ -176,5 +176,7 @@
#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
#endif
diff --git a/ui/tremulous_alien_common_hud.h b/ui/tremulous_alien_common_hud.h
index e092ecf9..d4e8a4ce 100644
--- a/ui/tremulous_alien_common_hud.h
+++ b/ui/tremulous_alien_common_hud.h
@@ -224,3 +224,30 @@ itemDef
decoration
ownerdraw CG_PLAYER_ALIEN_SENSE
}
+
+//CHARGE BAR
+itemDef
+{
+ name "charge"
+ rect 292 426 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"
+}
+
+//CHARGE BAR BG
+itemDef
+{
+ name "chargebg"
+ rect 288 422 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"
+}
+
diff --git a/ui/tremulous_human_hud.menu b/ui/tremulous_human_hud.menu
index 5727aaf5..5847ceaf 100644
--- a/ui/tremulous_human_hud.menu
+++ b/ui/tremulous_human_hud.menu
@@ -345,6 +345,32 @@
ownerdraw CG_PLAYER_SELECT
}
+ //CHARGE BAR
+ itemDef
+ {
+ name "charge"
+ rect 292 404 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"
+ }
+
+ //CHARGE BAR BG
+ itemDef
+ {
+ name "chargebg"
+ rect 288 400 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"
+ }
+
//SELECTED
itemDef
{