r5303 - trunk/data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-12-24 17:48:53 -0500 (Wed, 24 Dec 2008)
New Revision: 5303

Modified:
   trunk/data/qcsrc/client/View.qc
   trunk/data/qcsrc/client/teamradar.qc
Log:
csqc: fix position of waypoints in intermission


Modified: trunk/data/qcsrc/client/View.qc
===================================================================
--- trunk/data/qcsrc/client/View.qc	2008-12-24 19:38:44 UTC (rev 5302)
+++ trunk/data/qcsrc/client/View.qc	2008-12-24 22:48:53 UTC (rev 5303)
@@ -189,6 +189,7 @@
 void PostInit(void);
 float Sbar_WouldDrawScoreboard ();
 float zoomscript_caught;
+float view_set;
 void CSQC_UpdateView(float w, float h)
 {
 	entity e;
@@ -200,12 +201,16 @@
 	WaypointSprite_Load();
 
 	// Render the Scene
-	view_origin = pmove_org + '0 0 1' * getstati(STAT_VIEWHEIGHT);
-	view_angles = input_angles;
-	makevectors(view_angles);
-	view_forward = v_forward;
-	view_right = v_right;
-	view_up = v_up;
+	if(!intermission || !view_set)
+	{
+		view_origin = pmove_org + '0 0 1' * getstati(STAT_VIEWHEIGHT);
+		view_angles = input_angles;
+		makevectors(view_angles);
+		view_forward = v_forward;
+		view_right = v_right;
+		view_up = v_up;
+		view_set = 1;
+	}
 
 	f = floor(cvar("v_flipped"));
 	cvar_set("v_flipped", ftos(!f));

Modified: trunk/data/qcsrc/client/teamradar.qc
===================================================================
--- trunk/data/qcsrc/client/teamradar.qc	2008-12-24 19:38:44 UTC (rev 5302)
+++ trunk/data/qcsrc/client/teamradar.qc	2008-12-24 22:48:53 UTC (rev 5303)
@@ -248,7 +248,7 @@
 	switch(cl_teamradar_rotation)
 	{
 		case 0:
-			teamradar_angle = input_angles_y - 90;
+			teamradar_angle = view_angles_y - 90;
 			break;
 		default:
 			teamradar_angle = 90 * cl_teamradar_rotation;
@@ -294,7 +294,7 @@
 		+ (1 - f) * normalsize;
 	teamradar_origin3d_in_texcoord = teamradar_3dcoord_to_texcoord(
 		  f * (mi_min + mi_max) * 0.5
-		+ (1 - f) * pmove_org);
+		+ (1 - f) * view_origin);
 
 	color = GetPlayerColor(player_localentnum-1);
 	rgb = GetTeamRGB(color);
@@ -340,7 +340,7 @@
 		//if(color == COLOR_SPECTATOR || color == color2)
 			draw_teamradar_player(tm.origin, tm.angles, GetTeamRGB(color2));
 	}
-	draw_teamradar_player(pmove_org, input_angles, '1 1 1');
+	draw_teamradar_player(view_origin, view_angles, '1 1 1');
 
 	drawresetcliparea();
 };