void CSQC_common_hud(void);
-void CSQC_kh_hud(void);
-void CSQC_ctf_hud(void);
void PostInit(void);
void CSQC_Demo_Camera();
float HUD_WouldDrawScoreboard ();
}
hud_alpha_fg = cvar_or("hud_fg_alpha", 1) * (1 - cvar("_menu_alpha"));
- hud_currentammo = cvar("hud_showcurrentammo");
- hud_hudselector = cvar("hud_hudselector");
hud_accuracy_hud = cvar_or("hud_accuracy_hud", 1);
ColorTranslateMode = cvar("cl_stripcolorcodes");
activeweapon = getstati(STAT_SWITCHWEAPON);
CSQC_common_hud();
// crosshair goes VERY LAST
- if(!scoreboard_active && !ons_showmap && !camera_active && !hudconf_active) {
+ if(!scoreboard_active && !camera_active && !hudconf_active) {
// TrueAim check
float shottype;
float bullets, ring_scale;
}
*/
- if (sb_showscores)
+ if (scoreboard_showscores)
{
HUD_DrawScoreboard();
HUD_DrawCenterPrint();
#define raptor_g2 "gfx/vehicles/raptor_bombs.tga"
#define raptor_s "gfx/vehicles/shiled.tga"
-#define spider_a1 "gfx/hud/sb_rocket.tga"
-#define spider_a2 "gfx/sb_bullets.tga"
-
void CSQC_RAPTOR_HUD()
{
float rockets, reload, heat, hp, shield, energy;
drawpic(hudloc, raptor_g2, picsize, '1 1 1' * reload + '1 0 0' * (1 - reload), 1, DRAWFLAG_NORMAL);
- if (sb_showscores)
+ if (scoreboard_showscores)
{
HUD_DrawScoreboard();
HUD_DrawCenterPrint();
- if (sb_showscores)
+ if (scoreboard_showscores)
{
HUD_DrawScoreboard();
HUD_DrawCenterPrint();
// hud first
HUD_Main();
- // is this needed?
- //HUD_UpdatePlayerTeams();
-
- if (intermission == 2) // map voting screen
+ // scoreboard/accuracy
+ if (intermission == 2 && !scoreboard_showaccuracy && !scoreboard_showscores) // map voting screen
{
- if(sb_showaccuracy && spectatee_status != -1) {
- HUD_DrawAccuracyStats();
- }
- else if(sb_showscores) {
- HUD_DrawScoreboard();
- }
- else
- HUD_FinaleOverlay();
-
+ HUD_FinaleOverlay();
HUD_Reset();
}
- else if (sb_showscores || sb_showaccuracy || sb_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
- {
- if(sb_showaccuracy && spectatee_status != -1)
- HUD_DrawAccuracyStats();
- else
- HUD_DrawScoreboard();
+ else if(scoreboard_showaccuracy && spectatee_status != -1)
+ HUD_DrawAccuracyStats();
+ else
+ HUD_DrawScoreboard();
+ if (scoreboard_showscores || scoreboard_showaccuracy || scoreboard_showscores_force || getstati(STAT_HEALTH) <= 0 || intermission == 1)
HUD_Reset();
- }
+
break;
case HUD_SPIDERBOT: