X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fview.qc;h=6648b7ecbf557922991c0e7373caebefc3eef5b9;hp=4297bacf4142bd5f3f06f25c68f4e8cc40107233;hb=00a0bc7a2ef3ba8b9c0d7edb1c066b8dac3d0298;hpb=725a0a04e9118c9ca833987803f8f80a08360aa0

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 4297bacf4..6648b7ecb 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -357,6 +357,7 @@ void viewmodel_draw(entity this)
 	this.angles = this.viewmodel_angles;
 	this.angles_x = (-90 * f * f);
 	viewmodel_animate(this);
+	MUTATOR_CALLHOOK(DrawViewModel, this);
 	setorigin(this, this.origin);
 }
 
@@ -1380,6 +1381,8 @@ void HUD_Draw(entity this)
 	if(!gametype)
 		return;
 
+	Hud_Dynamic_Frame();
+
 	if(!intermission)
 	if (MUTATOR_CALLHOOK(HUD_Draw_overlay))
 	{
@@ -1389,6 +1392,8 @@ void HUD_Draw(entity this)
 	{
 		drawfill('0 0 0', eX * vid_conwidth + eY * vid_conheight, ((STAT(REVIVE_PROGRESS)) ? ('0.25 0.90 1' + ('1 0 0' * STAT(REVIVE_PROGRESS)) + ('0 1 1' * STAT(REVIVE_PROGRESS) * -1)) : '0.25 0.90 1'), autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
 	}
+
+	HUD_Scale_Enable();
 	if(!intermission)
 	if(STAT(NADE_TIMER) && autocvar_cl_nade_timer) // give nade top priority, as it's a matter of life and death
 	{
@@ -1405,6 +1410,7 @@ 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(REVIVE_PROGRESS), '0.25 0.90 1', autocvar_hud_colorflash_alpha, DRAWFLAG_ADDITIVE);
 		drawstring_aspect(eY * 0.64 * vid_conheight, _("Revival progress"), eX * vid_conwidth + eY * 0.025 * vid_conheight, '1 1 1', 1, DRAWFLAG_NORMAL);
 	}
+	HUD_Scale_Disable();
 
 	if(autocvar_r_letterbox == 0)
 		if(autocvar_viewsize < 120)
@@ -2271,7 +2277,9 @@ void CSQC_UpdateView(entity this, float w, float h)
 	// draw 2D entities
 	IL_EACH(g_drawables_2d, it.draw2d, it.draw2d(it));
 	Draw_ShowNames_All();
+#ifdef DEBUGDRAW
 	Debug_Draw();
+#endif
 
 	scoreboard_active = Scoreboard_WouldDraw();