X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fview.qc;h=d309f4d9a757a44feaa13089473b52d2f1986d45;hp=339d05209d2e891dbc195458fecfd2ed7574838e;hb=b0a563c3658ec620ddb9037b9417b743a47002a5;hpb=641c47df604de42c11c68a7d80813b29affcefb2 diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 339d05209d..d309f4d9a7 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -1,7 +1,7 @@ #include "view.qh" #include "announcer.qh" -#include "hud/all.qh" +#include "hud/_mod.qh" #include "mapvoting.qh" #include "shownames.qh" #include "hud/panel/scoreboard.qh" @@ -13,16 +13,17 @@ #include #include #include +#include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -293,8 +294,8 @@ void viewmodel_draw(entity this) else if (wasinvehicle) a = 1; wasinvehicle = invehicle; Weapon wep = activeweapon; - int c = stof(getplayerkeyvalue(current_player, "colors")); - vector g = weaponentity_glowmod(wep, c); + int c = entcs_GetClientColors(current_player); + vector g = weaponentity_glowmod(wep, NULL, c); entity me = CSQCModel_server2csqc(player_localentnum - 1); int fx = ((me.csqcmodel_effects & EFMASK_CHEAP) | EF_NODEPTHTEST) @@ -710,7 +711,6 @@ float TrueAimCheck() void PostInit(); void CSQC_Demo_Camera(); -float Scoreboard_WouldDraw(); float camera_mode; const float CAMERA_FREE = 1; const float CAMERA_CHASE = 2; @@ -937,7 +937,7 @@ void HUD_Crosshair(entity this) float f, i, j; vector v; if(!scoreboard_active && !camera_active && intermission != 2 && - spectatee_status != -1 && !csqcplayer.viewloc && + spectatee_status != -1 && !csqcplayer.viewloc && !MUTATOR_CALLHOOK(DrawCrosshair) && !HUD_MinigameMenu_IsOpened() ) { if (!autocvar_crosshair_enabled) // main toggle for crosshair rendering @@ -980,7 +980,7 @@ void HUD_Crosshair(entity this) v = wcross_origin - wcross_oldorigin; v.x /= vid_conwidth; v.y /= vid_conheight; - if(vlen(v) > 0.01) + if(vdist(v, >, 0.01)) shottype = SHOTTYPE_HITOBSTRUCTION; } if(!autocvar_crosshair_hittest_showimpact) @@ -1322,6 +1322,13 @@ void HUD_Crosshair(entity this) void HUD_Draw(entity this) { + // if we don't know gametype and scores yet avoid drawing the scoreboard + // also in the very first frames, player state may be inconsistent so avoid drawing the hud at all + // e.g. since initial player's health is 0 hud would display the hud_damage effect, + // cl_deathscoreboard would show the scoreboard and so on + if(!gametype) + return; + if(!intermission) if (MUTATOR_CALLHOOK(HUD_Draw_overlay)) { @@ -1337,6 +1344,11 @@ void HUD_Draw(entity this) DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", STAT(NADE_TIMER), '0.25 0.90 1' + ('1 0 0' * STAT(NADE_TIMER)) - ('0 1 1' * STAT(NADE_TIMER)), autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE); drawstring_aspect(eY * 0.64 * vid_conheight, ((autocvar_cl_nade_timer == 2) ? _("Nade timer") : ""), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL); } + else if(STAT(CAPTURE_PROGRESS)) + { + DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", STAT(CAPTURE_PROGRESS), '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE); + drawstring_aspect(eY * 0.64 * vid_conheight, _("Capture progress"), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL); + } else if(STAT(REVIVE_PROGRESS)) { DrawCircleClippedPic(eX * 0.5 * vid_conwidth + eY * 0.6 * vid_conheight, 0.1 * vid_conheight, "gfx/crosshair_ring.tga", STAT(REVIVE_PROGRESS), '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE); @@ -1368,6 +1380,7 @@ float oldr_useportalculling; float oldr_useinfinitefarclip; void cl_notice_run(); + float prev_myteam; int lasthud; float vh_notice_time; @@ -1478,8 +1491,6 @@ void CSQC_UpdateView(entity this, float w, float h) cvar_set("chase_active", "0"); float vehicle_chase = (hud != HUD_NORMAL && (autocvar_cl_eventchase_vehicle || spectatee_status > 0)); - float ons_roundlost = (gametype == MAPINFO_TYPE_ONSLAUGHT && STAT(ROUNDLOST)); - entity gen = NULL; float vehicle_viewdist = 0; vector vehicle_viewofs = '0 0 0'; @@ -1494,17 +1505,18 @@ void CSQC_UpdateView(entity this, float w, float h) } } - if(ons_roundlost) - { - FOREACH_ENTITY_CLASS("onslaught_generator", it.health <= 0, { - gen = it; - break; - }); - if(!gen) - ons_roundlost = false; // don't enforce the 3rd person camera if there is no dead generator to show - } - if(WantEventchase(this) || (!autocvar_cl_orthoview && ons_roundlost)) + if(WantEventchase(this)) { + vector current_view_origin_override = '0 0 0'; + vector view_offset_override = '0 0 0'; + float chase_distance_override = 0; + bool custom_eventchase = MUTATOR_CALLHOOK(CustomizeEventchase, this); + if(custom_eventchase) + { + current_view_origin_override = M_ARGV(0, vector); + view_offset_override = M_ARGV(1, vector); + chase_distance_override = M_ARGV(0, float); + } eventchase_running = true; entity local_player = ((csqcplayer) ? csqcplayer : CSQCModel_server2csqc(player_localentnum - 1)); @@ -1513,7 +1525,8 @@ void CSQC_UpdateView(entity this, float w, float h) // make special vector since we can't use view_origin (It is one frame old as of this code, it gets set later with the results this code makes.) vector current_view_origin = (csqcplayer ? csqcplayer.origin : pmove_org); - if(ons_roundlost) { current_view_origin = gen.origin; } + if (custom_eventchase) + current_view_origin = current_view_origin_override; // detect maximum viewoffset and use it vector view_offset = autocvar_cl_eventchase_viewoffset; @@ -1524,7 +1537,8 @@ void CSQC_UpdateView(entity this, float w, float h) else view_offset = autocvar_cl_eventchase_vehicle_viewoffset; } - if(ons_roundlost) { view_offset = autocvar_cl_eventchase_generator_viewoffset; } + if (custom_eventchase) + view_offset = view_offset_override; if(view_offset) { @@ -1547,7 +1561,8 @@ void CSQC_UpdateView(entity this, float w, float h) else chase_distance = autocvar_cl_eventchase_vehicle_distance; } - if(ons_roundlost) { chase_distance = autocvar_cl_eventchase_generator_distance; } + if (custom_eventchase) + chase_distance = chase_distance_override; if(autocvar_cl_eventchase_speed && eventchase_current_distance < chase_distance) eventchase_current_distance += autocvar_cl_eventchase_speed * (chase_distance - eventchase_current_distance) * frametime; // slow down the further we get @@ -1729,6 +1744,9 @@ void CSQC_UpdateView(entity this, float w, float h) if(!postinit) PostInit(); + if(intermission && !gameover_time) + gameover_time = time; + if(intermission && !isdemo() && !(calledhooks & HOOK_END)) { if(calledhooks & HOOK_START) @@ -1768,13 +1786,6 @@ void CSQC_UpdateView(entity this, float w, float h) switchweapon = Weapons_from(STAT(SWITCHWEAPON)); - f = (serverflags & SERVERFLAG_TEAMPLAY); - if(f != teamplay) - { - teamplay = f; - Scoreboard_InitScores(); - } - if(last_switchweapon != switchweapon) { weapontime = time; @@ -1825,8 +1836,7 @@ void CSQC_UpdateView(entity this, float w, float h) else if(csqcplayer.viewloc) { setproperty(VF_FOV, GetViewLocationFOV(110)); } // enforce 110 fov, so things dont look odd else { setproperty(VF_FOV, GetCurrentFov(fov)); } - // Camera for demo playback - if(camera_active) + if(camera_active) // Camera for demo playback { if(autocvar_camera_enable) CSQC_Demo_Camera(); @@ -2240,7 +2250,7 @@ void CSQC_UpdateView(entity this, float w, float h) if(autocvar__hud_configure) HUD_Panel_Mouse(); - else if ( HUD_MinigameMenu_IsOpened() || minigame_isactive() ) + else if (HUD_MinigameMenu_IsOpened() || active_minigame) HUD_Minigame_Mouse(); else if(QuickMenu_IsOpened()) QuickMenu_Mouse();