X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fview.qc;h=a296bd81d45e14065542e04d7be71d5d9701901c;hb=a3e71389992c582ccf77ca5b11d1f0ceee50eb9f;hp=530324656373d1346762879984b5473795df5af5;hpb=561489d21c9053b7103c6604c362aa24ee5c7916;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/view.qc b/qcsrc/client/view.qc
index 530324656..a296bd81d 100644
--- a/qcsrc/client/view.qc
+++ b/qcsrc/client/view.qc
@@ -287,7 +287,7 @@ void viewmodel_draw(entity this)
 	if (invehicle) a = -1;
 	Weapon wep = this.activeweapon;
 	int c = entcs_GetClientColors(current_player);
-	vector g = weaponentity_glowmod(wep, NULL, c, this);
+	vector g = weaponentity_glowmod(wep, c, this);
 	entity me = CSQCModel_server2csqc(player_localentnum - 1);
 	int fx = ((me.csqcmodel_effects & EFMASK_CHEAP)
 		| EF_NODEPTHTEST)
@@ -359,11 +359,6 @@ STATIC_INIT(viewmodel) {
 vector project_3d_to_2d(vector vec)
 {
 	vec = cs_project(vec);
-	if(cs_project_is_b0rked > 0)
-	{
-		vec.x *= vid_conwidth / vid_width;
-		vec.y *= vid_conheight / vid_height;
-	}
 	return vec;
 }
 
@@ -922,6 +917,7 @@ void HUD_Draw(entity this)
 	UpdateDamage();
 	HUD_Crosshair(this);
 	HitSound();
+	Local_Notification_Queue_Process();
 }
 
 void ViewLocation_Mouse()
@@ -1716,6 +1712,11 @@ void CSQC_UpdateView(entity this, float w, float h)
 	Debug_Draw();
 #endif
 
+	if (autocvar__scoreboard_team_selection)
+	{
+		Scoreboard_UI_Enable(1);
+		cvar_set("_scoreboard_team_selection", "0");
+	}
 	scoreboard_active = Scoreboard_WouldDraw();
 
 	HUD_Draw(this); // this parameter for deep vehicle function
@@ -1726,34 +1727,6 @@ void CSQC_UpdateView(entity this, float w, float h)
 		NextFrameCommand = string_null;
 	}
 
-	// we must do this check AFTER a frame was rendered, or it won't work
-	if(cs_project_is_b0rked == 0)
-	{
-		string w0, h0;
-		w0 = ftos(autocvar_vid_conwidth);
-		h0 = ftos(autocvar_vid_conheight);
-		//setproperty(VF_VIEWPORT, '0 0 0', '640 480 0');
-		//setproperty(VF_FOV, '90 90 0');
-		setproperty(VF_ORIGIN, '0 0 0');
-		setproperty(VF_ANGLES, '0 0 0');
-		setproperty(VF_PERSPECTIVE, 1);
-		vector forward, right, up;
-		MAKE_VECTORS('0 0 0', forward, right, up);
-		vector v1, v2;
-		cvar_set("vid_conwidth", "800");
-		cvar_set("vid_conheight", "600");
-		v1 = cs_project(forward);
-		cvar_set("vid_conwidth", "640");
-		cvar_set("vid_conheight", "480");
-		v2 = cs_project(forward);
-		if(v1 == v2)
-			cs_project_is_b0rked = 1;
-		else
-			cs_project_is_b0rked = -1;
-		cvar_set("vid_conwidth", w0);
-		cvar_set("vid_conheight", h0);
-	}
-
 	HUD_Mouse(local_player);
 
 	cl_notice_run();