X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fview.qc;h=cd156e65ec7b3989e0afc6ce1d8a08faa4c4aa12;hb=5da6bc592812c014078f0eee3368773282659ff9;hp=70d1f02f4ba18f563263d2ca2c646115b5e6a7c7;hpb=d33f2c481cd158883cb7e45d0d44c54cf59a9def;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc index 70d1f02f4..cd156e65e 100644 --- a/qcsrc/client/view.qc +++ b/qcsrc/client/view.qc @@ -1,10 +1,10 @@ #include "view.qh" #include "announcer.qh" -#include "hud/all.qh" +#include "hud/_mod.qh" #include "mapvoting.qh" -#include "scoreboard.qh" #include "shownames.qh" +#include "hud/panel/scoreboard.qh" #include "hud/panel/quickmenu.qh" #include "mutators/events.qh" @@ -15,14 +15,14 @@ #include #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -293,7 +293,7 @@ void viewmodel_draw(entity this) else if (wasinvehicle) a = 1; wasinvehicle = invehicle; Weapon wep = activeweapon; - int c = stof(getplayerkeyvalue(current_player, "colors")); + int c = entcs_GetClientColors(current_player); vector g = weaponentity_glowmod(wep, c); entity me = CSQCModel_server2csqc(player_localentnum - 1); int fx = ((me.csqcmodel_effects & EFMASK_CHEAP) @@ -363,6 +363,7 @@ STATIC_INIT(Porto) { entity e = new_pure(porto); e.draw = Porto_Draw; + IL_PUSH(g_drawables, e); e.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP; } @@ -709,7 +710,7 @@ float TrueAimCheck() void PostInit(); void CSQC_Demo_Camera(); -float HUD_WouldDrawScoreboard(); +float Scoreboard_WouldDraw(); float camera_mode; const float CAMERA_FREE = 1; const float CAMERA_CHASE = 2; @@ -791,7 +792,7 @@ void UpdateDamage() if (damage_dealt_time != damage_dealt_time_prev) { unaccounted_damage += unaccounted_damage_new; - LOG_TRACE("dmg total: ", ftos(unaccounted_damage), " (+", ftos(unaccounted_damage_new), ")", "\n"); + LOG_TRACE("dmg total: ", ftos(unaccounted_damage), " (+", ftos(unaccounted_damage_new), ")"); } damage_dealt_time_prev = damage_dealt_time; @@ -831,7 +832,7 @@ void HitSound() pitch_shift = mirror_value + (mirror_value - pitch_shift); } - LOG_TRACE("dmg total (dmg): ", ftos(unaccounted_damage), " , pitch shift: ", ftos(pitch_shift), "\n"); + LOG_TRACE("dmg total (dmg): ", ftos(unaccounted_damage), " , pitch shift: ", ftos(pitch_shift)); // todo: avoid very long and very short sounds from wave stretching using different sound files? seems unnecessary // todo: normalize sound pressure levels? seems unnecessary @@ -860,7 +861,7 @@ vector crosshair_getcolor(entity this, float health_stat) { case 1: // crosshair_color_per_weapon { - if(this != WEP_Null) + if(this != WEP_Null && hud == HUD_NORMAL) { wcross_color = this.wpcolor; break; @@ -936,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 @@ -979,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) @@ -1321,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)) { @@ -1336,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); @@ -1349,7 +1362,6 @@ void HUD_Draw(entity this) Accuracy_LoadLevels(); HUD_Main(); - HUD_DrawScoreboard(); HUD_Scale_Disable(); } @@ -1368,6 +1380,7 @@ float oldr_useportalculling; float oldr_useinfinitefarclip; void cl_notice_run(); + float prev_myteam; int lasthud; float vh_notice_time; @@ -1407,10 +1420,6 @@ void CSQC_UpdateView(entity this, float w, float h) else view_quality = 1; - // this needs to be updated manually now due to the destruction of engine physics stats - if(!isdemo() && autocvar_slowmo != STAT(MOVEVARS_TIMESCALE)) - cvar_set("slowmo", ftos(STAT(MOVEVARS_TIMESCALE))); - button_attack2 = PHYS_INPUT_BUTTON_ATCK2(this); button_zoom = PHYS_INPUT_BUTTON_ZOOM(this); @@ -1498,9 +1507,10 @@ void CSQC_UpdateView(entity this, float w, float h) } } - if(ons_roundlost) + if(ons_roundlost) // TODO: move this junk to a client mutator for onslaught (possible using the WantEventchase hook) { - FOREACH_ENTITY_CLASS("onslaught_generator", it.health <= 0, { + IL_EACH(g_onsgenerators, it.health <= 0, + { gen = it; break; }); @@ -1733,6 +1743,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) @@ -1772,13 +1785,6 @@ void CSQC_UpdateView(entity this, float w, float h) switchweapon = Weapons_from(STAT(SWITCHWEAPON)); - f = (serverflags & SERVERFLAG_TEAMPLAY); - if(f != teamplay) - { - teamplay = f; - HUD_InitScores(); - } - if(last_switchweapon != switchweapon) { weapontime = time; @@ -1829,8 +1835,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(); @@ -1871,7 +1876,7 @@ void CSQC_UpdateView(entity this, float w, float h) mousepos = mousepos*0.5 + getmousepos(); */ - FOREACH_ENTITY(it.draw, it.draw(it)); + IL_EACH(g_drawables, it.draw, it.draw(it)); addentities(MASK_NORMAL | MASK_ENGINE | MASK_ENGINEVIEWMODELS); renderscene(); @@ -2201,11 +2206,11 @@ void CSQC_UpdateView(entity this, float w, float h) } else */ // draw 2D entities - FOREACH_ENTITY(it.draw2d, it.draw2d(it)); + IL_EACH(g_drawables_2d, it.draw2d, it.draw2d(it)); Draw_ShowNames_All(); Debug_Draw(); - scoreboard_active = HUD_WouldDrawScoreboard(); + scoreboard_active = Scoreboard_WouldDraw(); HUD_Draw(this); // this parameter for deep vehicle function @@ -2258,6 +2263,8 @@ void CSQC_UpdateView(entity this, float w, float h) // let's reset the view back to normal for the end setproperty(VF_MIN, '0 0 0'); setproperty(VF_SIZE, '1 0 0' * w + '0 1 0' * h); + + IL_ENDFRAME(); }