X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2FView.qc;h=37452401021e1479a5bd41f6ab6f0e905272c665;hp=f1352472bc64cbd2e22db7cac0c64e984721d39b;hb=9a2efec7718c9dd4805a8982f475f86f05509979;hpb=fb4538beb6e037d32fccbc48c9942ea321a79048

diff --git a/qcsrc/client/View.qc b/qcsrc/client/View.qc
index f1352472bc..3745240102 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 && nex_scope) || (getstati(STAT_ACTIVEWEAPON) == WEP_SNIPERRIFLE && sniperrifle_scope)) // do NOT use switchweapon here
+	if((getstati(STAT_ACTIVEWEAPON) == WEP_NEX && nex_scope) || (getstati(STAT_ACTIVEWEAPON) == WEP_RIFLE && rifle_scope)) // do NOT use switchweapon here
 		zoomdir += button_attack2;
 	if(spectatee_status > 0 || isdemo())
 	{
@@ -274,7 +274,7 @@ float TrueAimCheck()
 		case WEP_MINSTANEX:
 			mv = MOVE_NORMAL;
 			break;
-		case WEP_SNIPERRIFLE:
+		case WEP_RIFLE:
 			ta = trueaim_rifle;
 			mv = MOVE_NORMAL;
 			if(zoomscript_caught)
@@ -454,6 +454,7 @@ void CSQC_UpdateView(float w, float h)
 			eventchase_target_origin = pmove_org - v_forward * eventchase_current_distance * (trace_fraction - 0.1);
 
 			R_SetView(VF_ORIGIN, eventchase_target_origin);
+			R_SetView(VF_ANGLES, view_angles);
 		}
 		else if(autocvar_chase_active < 0) // time to disable chase_active if it was set by this code
 		{
@@ -605,10 +606,6 @@ void CSQC_UpdateView(float w, float h)
 	// Draw the Engine Status Bar (the default Quake HUD)
 	R_SetView(VF_DRAWENGINEHUD, 0);
 
-	// fetch this one only once per frame
-	hud_showbinds = autocvar_hud_showbinds;
-	hud_showbinds_limit = autocvar_hud_showbinds_limit;
-
 	// Update the mouse position
 	/*
 	   mousepos_x = vid_conwidth;
@@ -686,11 +683,11 @@ void CSQC_UpdateView(float w, float h)
 	// 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(activeweapon == WEP_NEX && (button_zoom || zoomscript_caught) || activeweapon == WEP_SNIPERRIFLE && (button_zoom || zoomscript_caught) || activeweapon == WEP_MINSTANEX && (button_zoom || zoomscript_caught))
+	else if(activeweapon == WEP_NEX && (button_zoom || zoomscript_caught) || activeweapon == WEP_RIFLE && (button_zoom || zoomscript_caught) || activeweapon == WEP_MINSTANEX && (button_zoom || zoomscript_caught))
 		reticle_type = 2; // nex zoom
 	else if(button_zoom || zoomscript_caught)
 		reticle_type = 1; // normal zoom
-	else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_SNIPERRIFLE && button_attack2)
+	else if(activeweapon == WEP_NEX && button_attack2 || activeweapon == WEP_RIFLE && button_attack2)
 		reticle_type = 2; // nex zoom
 
 	if (reticle_type)
@@ -864,6 +861,7 @@ void CSQC_UpdateView(float w, float h)
 		if(self.draw2d)
 			self.draw2d();
 	self = e;
+	Draw_ShowNames_All();
 
 	scoreboard_active = HUD_WouldDrawScoreboard();
 
@@ -906,7 +904,7 @@ void CSQC_UpdateView(float w, float h)
 				CSQC_common_hud();
 
 		// crosshair goes VERY LAST
-		if(!scoreboard_active && !camera_active && intermission != 2) {
+		if(!scoreboard_active && !camera_active && intermission != 2 && spectatee_status != -1) {
 			string wcross_style;
 			float wcross_alpha, wcross_resolution;
 			wcross_style = autocvar_crosshair;
@@ -1188,8 +1186,8 @@ void CSQC_UpdateView(float w, float h)
 					
 					// Note: This is to stop Taoki from complaining that the image doesn't match all potential balances.
 					// if a new image for another weapon is added, add the code (and its respective file/value) here
-					if ((activeweapon == WEP_SNIPERRIFLE) && (weapon_clipsize == 80))
-						ring_image = "gfx/crosshair_ring_sniperrifle.tga";
+					if ((activeweapon == WEP_RIFLE) && (weapon_clipsize == 80))
+						ring_image = "gfx/crosshair_ring_rifle.tga";
 					else
 						ring_image = "gfx/crosshair_ring.tga";
 				}
@@ -1423,7 +1421,6 @@ void CSQC_SPIDER_HUD()
 	if (scoreboard_showscores)
 	{
 		HUD_DrawScoreboard();
-		HUD_DrawCenterPrint();
 	}
 
 }
@@ -1490,7 +1487,6 @@ void CSQC_RAPTOR_HUD()
 	if (scoreboard_showscores)
 	{
 		HUD_DrawScoreboard();
-		HUD_DrawCenterPrint();
 	}
 
 }
@@ -1600,12 +1596,10 @@ const float STAT_VEHICLESTAT_RELOAD2 = 66;
 	if (scoreboard_showscores)
 	{
 		HUD_DrawScoreboard();
-		HUD_DrawCenterPrint();
 	}
 
 }
 
-
 void CSQC_common_hud(void)
 {
 	// HUD_SortFrags(); done in HUD_Draw
@@ -1640,25 +1634,12 @@ void CSQC_common_hud(void)
 			HUD_DrawScoreboard();
 
 			if (scoreboard_active) // scoreboard/accuracy
-			{	
 				HUD_Reset();
-				// HUD_DrawScoreboard takes care of centerprint_start
-			}
 			else if (intermission == 2) // map voting screen
 			{
 				HUD_FinaleOverlay();
 				HUD_Reset();
-
-				centerprint_start_x = 0;
-				centerprint_start_y = autocvar_scr_centerpos * vid_conheight;
 			}
-			else // hud
-			{
-				centerprint_start_x = 0;
-				centerprint_start_y = autocvar_scr_centerpos * vid_conheight;
-			}
-
-			HUD_DrawCenterPrint();
 			break;
 
 		case HUD_SPIDERBOT: