void CSQC_common_hud(void);
-void CSQC_kh_hud(void);
-void CSQC_ctf_hud(void);
void PostInit(void);
void CSQC_Demo_Camera();
-float Sbar_WouldDrawScoreboard ();
+float HUD_WouldDrawScoreboard ();
float view_set;
float camera_mode;
+float reticle_type;
string NextFrameCommand;
void CSQC_SPIDER_HUD();
+void CSQC_RAPTOR_HUD();
+
+vector freeze_pmove_org, freeze_input_angles;
+
void CSQC_UpdateView(float w, float h)
{
entity e;
float f, i, j;
vector v, vo;
+ vector reticle_pos, reticle_size;
+
WaypointSprite_Load();
if(spectatee_status)
vo = '0 0 1' * getstati(STAT_VIEWHEIGHT);
warpzone_fixview_origin = pmove_org + vo;
- warpzone_fixview_angles = input_angles;
+ warpzone_fixview_cl_viewangles = input_angles;
+ warpzone_fixview_angles = view_angles;
WarpZone_FixView();
pmove_org = warpzone_fixview_origin - vo;
- input_angles = warpzone_fixview_angles;
+ input_angles = warpzone_fixview_cl_viewangles;
+ view_angles = warpzone_fixview_angles;
+
+ if(cvar("cl_lockview") || hud_configure)
+ {
+ pmove_org = freeze_pmove_org;
+ input_angles = view_angles = freeze_input_angles;
+ R_SetView(VF_ORIGIN, pmove_org + vo);
+ R_SetView(VF_ANGLES, view_angles);
+ //R_SetView(VF_CL_VIEWANGLES, input_angles);
+ }
+ freeze_pmove_org = pmove_org;
+ freeze_input_angles = input_angles;
// Render the Scene
if(!intermission || !view_set)
}
#endif
+ TargetMusic_Advance();
Fog_Force();
drawframetime = max(0.000001, time - drawtime);
}
}
- sbar_alpha_fg = cvar("sbar_alpha_fg" ) * (1 - cvar("_menu_alpha"));
- sbar_currentammo = cvar("sbar_showcurrentammo");
- sbar_hudselector = cvar("sbar_hudselector");
- sbar_accuracy_hud = cvar_or("sbar_accuracy_hud", 1);
+ hud_accuracy_hud = cvar_or("hud_accuracy_hud", 1);
ColorTranslateMode = cvar("cl_stripcolorcodes");
activeweapon = getstati(STAT_SWITCHWEAPON);
f = cvar("teamplay");
if(f != teamplay)
{
teamplay = f;
- Sbar_InitScores();
+ HUD_InitScores();
}
if(last_weapon != activeweapon) {
// Draw the Crosshair
float scoreboard_active;
- scoreboard_active = Sbar_WouldDrawScoreboard();
+ scoreboard_active = HUD_WouldDrawScoreboard();
R_SetView(VF_DRAWCROSSHAIR, 0); //Make sure engine crosshairs are always hidden
// Draw the Engine Status Bar (the default Quake HUD)
- R_SetView(VF_DRAWENGINESBAR, 0);
+ R_SetView(VF_DRAWENGINEHUD, 0);
// fetch this one only once per frame
- sbar_showbinds = cvar("sbar_showbinds");
- sbar_showbinds_limit = cvar("sbar_showbinds_limit");
+ hud_showbinds = cvar("hud_showbinds");
+ hud_showbinds_limit = cvar("hud_showbinds_limit");
// Update the mouse position
/*
// next R_RenderScene call
drawstring('0 0 0', "", '1 1 0', '1 1 1', 0, 0);
+ // Draw the aiming reticle for weapons that use it
+ // reticle_type is changed to the item we are zooming / aiming with, to decide which reticle to use
+ // It must be a persisted float for fading out to work properly (you let go of the zoom button for the
+ // view to go back to normal, so reticle_type would become 0 as we fade out and use that image instead)
+ if(button_zoom)
+ reticle_type = 0; // normal zoom
+ else if(activeweapon == WEP_NEX && button_attack2)
+ reticle_type = 1; // nex zoom
+
+ reticle_size_x = max(vid_conwidth, vid_conheight);
+ reticle_size_y = max(vid_conwidth, vid_conheight);
+ reticle_pos_x = (vid_conwidth - reticle_size_x) / 2;
+ reticle_pos_y = (vid_conheight - reticle_size_y) / 2;
+
+ if(cvar("cl_reticle_normal"))
+ {
+ precache_pic("textures/reticle_normal");
+ if(reticle_type == 0 && current_zoomfraction)
+ drawpic(reticle_pos, "textures/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_normal"), DRAWFLAG_NORMAL);
+ }
+ if(cvar("cl_reticle_nex"))
+ {
+ precache_pic("textures/reticle_nex");
+ if(reticle_type == 1 && current_zoomfraction)
+ drawpic(reticle_pos, "textures/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_nex"), DRAWFLAG_NORMAL);
+ }
+
// Draw the mouse cursor
// NOTE: drawpic must happen after R_RenderScene for some reason
//drawpic(getmousepos(), "gfx/cursor.tga", '11 14 0', '1 1 1', 1, 0);
self.draw2d();
self = e;
- // draw radar
- if(
- ons_showmap
- ||
- (
- !scoreboard_active
- &&
- cvar_string("cl_teamradar") != "0"
- &&
- (
- cvar("cl_teamradar") == 2
- ||
- teamplay
- )
- )
- )
- teamradar_view();
-
- // draw sbar
+ // draw hud
if(cvar("r_letterbox") == 0) {
- if (cvar("cl_showpressedkeys")) { // draw pressed keys when spectating and playing
- if(spectatee_status > 0 || cvar("cl_showpressedkeys") >= 2)
- Sbar_DrawPressedKeys();
- }
-
- if (cvar("cl_showspeed"))
- Sbar_ShowSpeed();
- if (cvar("cl_showacceleration"))
- Sbar_ShowAcceleration();
-
- Sbar_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120
+ HUD_DrawCenterPrint(); // draw centerprint messages even if viewsize >= 120
}
float hud;
}
else if(hud == HUD_WAKIZASHI)
CSQC_WAKIZASHI_HUD();
+ else if(hud == HUD_RAPTOR)
+ CSQC_RAPTOR_HUD();
else
{
if(cvar("r_letterbox") == 0)
CSQC_common_hud();
// crosshair goes VERY LAST
- if(!scoreboard_active && !ons_showmap && !camera_active) {
+ if(!scoreboard_active && !camera_active) {
// TrueAim check
float shottype;
float bullets, ring_scale;
bullets = 0;
#define CROSSHAIR_DRAW_RING(i,j,sz,wcross_name,wcross_alpha) \
- drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
+ drawpic(wcross_origin - ('0.5 0 0' * (sz * wcross_size_x * ring_scale + i * wcross_blur) + '0 0.5 0' * (sz * wcross_size_y * ring_scale + j * wcross_blur)), strcat("gfx/hud/", cvar_string("hud_skin"), "/rifle_ring_", ftos(bullets)), sz * wcross_size * ring_scale, wcross_color, wcross_alpha, DRAWFLAG_NORMAL)
#define CROSSHAIR_DO_BLUR(M,sz,wcross_name,wcross_alpha) \
do \
cvar_set("vid_conheight", h0);
}
+ if(hud_configure)
+ HUD_Panel_Mouse();
// be safe against triggerbots until everyone has the fixed engine
// this call is meant to overwrite the trace globals by something
// unsuspicious
traceline('0 0 0', '0 0 0', MOVE_WORLDONLY, world);
}
-void Sbar_Draw();
#define spider_h "gfx/vehicles/hud_bg.tga"
#define spider_b "gfx/vehicles/sbot.tga"
#define spider_r "gfx/vehicles/sbot_rpods.tga"
#define spider_g "gfx/vehicles/sbot_mguns.tga"
#define spider_s "gfx/vehicles/shiled.tga"
-
#define spider_a1 "gfx/hud/sb_rocket.tga"
#define spider_a2 "gfx/sb_bullets.tga"
void CSQC_SPIDER_HUD()
{
- float rockets, reload, heat, hp, shield, i;
+ float rockets, reload, heat, hp, shield;
vector picsize, hudloc;
// Fetch health & ammo stats
hp = bound(0,getstatf(STAT_VEHICLESTAT_HEALTH), 1);
shield = bound(0,getstatf(STAT_VEHICLESTAT_SHIELD), 1);
- heat = min(getstatf(STAT_VEHICLESTAT_RELOAD1), 1);
+ heat = min(getstatf(STAT_VEHICLESTAT_RELOAD1), 2);
rockets = getstati(STAT_VEHICLESTAT_AMMO2);
reload = min(getstatf(STAT_VEHICLESTAT_RELOAD2), 1);
picsize = drawgetimagesize(spider_a2) * 0.5;
drawpic(hudloc + '120 96 0', spider_a2, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
-
drawstring(hudloc + '145 19 0', strcat(ftos(rint(hp * 100)), "%"),'15 15 0','0 1 0', 1, DRAWFLAG_NORMAL);
drawstring(hudloc + '175 34 0', strcat(ftos(rint(shield * 100)), "%"),'15 15 0','0 0 1', 1, DRAWFLAG_NORMAL);
-
drawstring(hudloc + '136 102 0', strcat(ftos(100 - rint(heat * 100)), "%"),'14 14 0','1 1 0', 1, DRAWFLAG_NORMAL);
picsize = drawgetimagesize(spider_a1) * 0.85;
}
*/
- if (sb_showscores)
+ if (scoreboard_showscores)
+ {
+ HUD_DrawScoreboard();
+ HUD_DrawCenterPrint();
+ }
+
+}
+
+#define raptor_h "gfx/vehicles/hud_bg.tga"
+#define raptor_b "gfx/vehicles/raptor.tga"
+#define raptor_g1 "gfx/vehicles/raptor_guns.tga"
+#define raptor_g2 "gfx/vehicles/raptor_bombs.tga"
+#define raptor_s "gfx/vehicles/shiled.tga"
+
+void CSQC_RAPTOR_HUD()
+{
+ float rockets, reload, heat, hp, shield, energy;
+ vector picsize, hudloc;
+
+ // Fetch health & ammo stats
+ hp = bound(0,getstatf(STAT_VEHICLESTAT_HEALTH), 1);
+ shield = bound(0,getstatf(STAT_VEHICLESTAT_SHIELD), 1);
+ reload = min(getstatf(STAT_VEHICLESTAT_RELOAD1), 1);
+ energy = min(getstatf(STAT_VEHICLESTAT_ENERGY), 1);
+
+ // Draw the crosshairs
+ picsize = drawgetimagesize(SPIDER_CROSS);
+ picsize_x *= cvar_or("cl_vehicle_spiderbot_cross_size", 1);
+ picsize_y *= cvar_or("cl_vehicle_spiderbot_cross_size", 1);
+ drawpic('0.5 0 0' * (vid_conwidth - picsize_x) + '0 0.5 0' * (vid_conheight - picsize_y), SPIDER_CROSS, picsize, '1 1 1', cvar_or("cl_vehicle_spiderbot_cross_alpha",0.6), DRAWFLAG_NORMAL);
+
+ hudloc_y = 4;
+ hudloc_x = 4;
+
+ picsize = drawgetimagesize(raptor_h) * 0.5;
+ drawpic(hudloc, raptor_h, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+
+ picsize = drawgetimagesize(spider_a2) * 0.5;
+ drawpic(hudloc + '120 96 0', spider_a2, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+
+ drawstring(hudloc + '145 19 0', strcat(ftos(rint(hp * 100)), "%"),'15 15 0','0 1 0', 1, DRAWFLAG_NORMAL);
+ drawstring(hudloc + '175 34 0', strcat(ftos(rint(shield * 100)), "%"),'15 15 0','0 0 1', 1, DRAWFLAG_NORMAL);
+ drawstring(hudloc + '136 102 0', strcat(ftos(rint(energy * 100)), "%"),'15 15 0','0.5 0.5 1', 1, DRAWFLAG_NORMAL);
+
+
+ picsize = drawgetimagesize(spider_a1) * 0.85;
+ if(reload == 1)
+ {
+ drawpic(hudloc + '132 54 0', spider_a1, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+ drawstring(hudloc + '179 69 0', strcat(ftos(rint(reload * 100)), "%"),'14 14 0','0 1 0', 0.5, DRAWFLAG_NORMAL);
+ }
+ else
+ {
+ drawpic(hudloc + '132 54 0', spider_a1, picsize, '1 1 1', 1, DRAWFLAG_NORMAL);
+ drawstring(hudloc + '179 69 0', strcat(ftos(rint(reload * 100)), "%"),'14 14 0','0 0 1', 1, DRAWFLAG_NORMAL);
+ }
+
+ picsize = drawgetimagesize(raptor_b) * 0.5;
+ hudloc_y = 10.5;
+ hudloc_x = 10.5;
+
+ drawpic(hudloc, raptor_s, picsize, '1 1 1', shield, DRAWFLAG_NORMAL);
+ drawpic(hudloc, raptor_b, picsize, '0 1 0' * hp + '1 0 0' * (1 - hp), 1, DRAWFLAG_NORMAL);
+ drawpic(hudloc, raptor_g1, picsize, '1 1 1' * energy + '1 0 0' * (1 - energy), 1, DRAWFLAG_NORMAL);
+ drawpic(hudloc, raptor_g2, picsize, '1 1 1' * reload + '1 0 0' * (1 - reload), 1, DRAWFLAG_NORMAL);
+
+
+ if (scoreboard_showscores)
{
- Sbar_DrawScoreboard();
- Sbar_DrawCenterPrint();
+ HUD_DrawScoreboard();
+ HUD_DrawCenterPrint();
}
}
- if (sb_showscores)
+ if (scoreboard_showscores)
{
- Sbar_DrawScoreboard();
- Sbar_DrawCenterPrint();
+ HUD_DrawScoreboard();
+ HUD_DrawCenterPrint();
}
}
void CSQC_common_hud(void)
{
- // Sbar_SortFrags(); done in Sbar_Draw
+ // HUD_SortFrags(); done in HUD_Draw
float hud;
hud = getstati(STAT_HUD);
switch(hud)
{
case HUD_NORMAL:
- Sbar_Draw();
+ // hud first
+ HUD_Main();
+
+ // scoreboard/accuracy
+ if (intermission == 2 && !scoreboard_showaccuracy && !scoreboard_showscores) // map voting screen
+ {
+ HUD_FinaleOverlay();
+ HUD_Reset();
+ }
+ 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:
projects / xonotic / xonotic-data.pk3dir.git / blobdiff