X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fclient%2FView.qc;h=3033cfa78a7cc3b6de68a8d84ca3c73eb98ccbd5;hb=b46fdcee5c729ccdf485d908803d06bbfdac2a8c;hp=85394b5aed75136bb5f92496d9fc1ef38b515847;hpb=e47fe4a1e465ca76d53c6756973896fd57bc4f82;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc index 85394b5ae..3033cfa78 100644 --- a/qcsrc/client/View.qc +++ b/qcsrc/client/View.qc @@ -137,7 +137,7 @@ vector GetCurrentFov(float fov) zoomspeed = 3.5; zoomdir = button_zoom; - if(getstati(STAT_ACTIVEWEAPON) == WEP_NEX) // do NOT use switchweapon here + if(getstati(STAT_ACTIVEWEAPON) == WEP_NEX || (getstati(STAT_ACTIVEWEAPON) == WEP_CAMPINGRIFLE && campingrifle_scope)) // do NOT use switchweapon here zoomdir += button_attack2; if(spectatee_status > 0 || isdemo()) { @@ -341,6 +341,7 @@ void CSQC_Demo_Camera(); float HUD_WouldDrawScoreboard (); float view_set; float camera_mode; +float reticle_type; string NextFrameCommand; void CSQC_SPIDER_HUD(); void CSQC_RAPTOR_HUD(); @@ -354,6 +355,8 @@ void CSQC_UpdateView(float w, float h) float f, i, j; vector v, vo; + vector reticle_pos, reticle_size; + WaypointSprite_Load(); if(spectatee_status) @@ -372,7 +375,7 @@ void CSQC_UpdateView(float w, float h) input_angles = warpzone_fixview_cl_viewangles; view_angles = warpzone_fixview_angles; - if(cvar("cl_lockview")) + if(cvar("cl_lockview") || autocvar__hud_configure) { pmove_org = freeze_pmove_org; input_angles = view_angles = freeze_input_angles; @@ -395,10 +398,6 @@ void CSQC_UpdateView(float w, float h) view_set = 1; } - hudconf_active = cvar("_hud_configure"); - if(hudconf_active) - R_SetView(VF_ANGLES, self.angles); // TODO: this should freeze the view as it is, not change it to '0 0 0' or whatever it currently does... - vid_width = w; vid_height = h; @@ -436,7 +435,7 @@ void CSQC_UpdateView(float w, float h) if(intermission && !isdemo() && !(calledhooks & HOOK_END)) if(calledhooks & HOOK_START) { - localcmd("\ncl_hook_gameend;"); + localcmd("\ncl_hook_gameend\n"); calledhooks |= HOOK_END; } @@ -465,7 +464,6 @@ void CSQC_UpdateView(float w, float h) } } - hud_alpha_fg = cvar_or("hud_fg_alpha", 1) * (1 - cvar("_menu_alpha")); hud_accuracy_hud = cvar_or("hud_accuracy_hud", 1); ColorTranslateMode = cvar("cl_stripcolorcodes"); activeweapon = getstati(STAT_SWITCHWEAPON); @@ -479,6 +477,12 @@ void CSQC_UpdateView(float w, float h) if(last_weapon != activeweapon) { weapontime = time; last_weapon = activeweapon; + + e = get_weaponinfo(activeweapon); + if(e.netname != "") + localcmd(strcat("\ncl_hook_activeweapon ", e.netname), "\n"); + else + localcmd("\ncl_hook_activeweapon none\n"); } // ALWAYS Clear Current Scene First @@ -554,6 +558,45 @@ void CSQC_UpdateView(float w, float h) // 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) + if(spectatee_status || getstati(STAT_HEALTH) <= 0) + reticle_type = 0; // prevent reticle from showing during the respawn zoom effect or for spectators + else if(button_zoom) + reticle_type = 1; // normal zoom + else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_CAMPINGRIFLE && button_attack2) + reticle_type = 2; // nex zoom + + if(cvar("cl_reticle_stretch")) + { + reticle_size_x = vid_conwidth; + reticle_size_y = vid_conheight; + reticle_pos_x = 0; + reticle_pos_y = 0; + } + else + { + 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_item_normal")) + { + precache_pic("gfx/reticle_normal"); + if(reticle_type == 1 && current_zoomfraction) + drawpic(reticle_pos, "gfx/reticle_normal", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_normal"), DRAWFLAG_NORMAL); + } + if(cvar("cl_reticle_item_nex")) + { + precache_pic("gfx/reticle_nex"); + if(reticle_type == 2 && current_zoomfraction) + drawpic(reticle_pos, "gfx/reticle_nex", reticle_size, '1 1 1', current_zoomfraction * cvar("cl_reticle_item_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); @@ -599,7 +642,7 @@ void CSQC_UpdateView(float w, float h) CSQC_common_hud(); // crosshair goes VERY LAST - if(!scoreboard_active && !camera_active && !hudconf_active) { + if(!scoreboard_active && !camera_active) { // TrueAim check float shottype; float bullets, ring_scale; @@ -735,7 +778,7 @@ void CSQC_UpdateView(float w, float h) 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/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 \ @@ -835,7 +878,7 @@ void CSQC_UpdateView(float w, float h) cvar_set("vid_conheight", h0); } - if(hudconf_active) + if(autocvar__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 @@ -950,7 +993,7 @@ void CSQC_SPIDER_HUD() } */ - if (sb_showscores) + if (scoreboard_showscores) { HUD_DrawScoreboard(); HUD_DrawCenterPrint(); @@ -964,10 +1007,6 @@ void CSQC_SPIDER_HUD() #define raptor_g2 "gfx/vehicles/raptor_bombs.tga" #define raptor_s "gfx/vehicles/shiled.tga" -// these are causing warnings! -#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; @@ -1021,7 +1060,7 @@ void CSQC_RAPTOR_HUD() 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(); @@ -1131,7 +1170,7 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66; - if (sb_showscores) + if (scoreboard_showscores) { HUD_DrawScoreboard(); HUD_DrawCenterPrint(); @@ -1150,34 +1189,35 @@ void CSQC_common_hud(void) switch(hud) { case HUD_NORMAL: + // do some accuracy var caching + float i; + if(!(gametype == GAME_RACE || gametype == GAME_CTS)) + { + acc_levels = tokenize(cvar_string("hud_panel_weapons_accuracy_color_levels")); + if (acc_levels > MAX_ACCURACY_LEVELS) + acc_levels = MAX_ACCURACY_LEVELS; + + for (i = 0; i < acc_levels; ++i) + acc_lev[i] = stof(argv(i)); + } + // 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: