r5953 - in branches/nexuiz-2.0: . data/qcsrc/client

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-02-24 10:52:23 -0500 (Tue, 24 Feb 2009)
New Revision: 5953

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/client/teamradar.qc
Log:
r5952 | div0 | 2009-02-24 16:40:24 +0100 (Tue, 24 Feb 2009) | 2 lines
fix cl_teamradar_foreground_alpha (the blendfunc it uses does not support alpha)

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2009-02-24 15:40:24 UTC (rev 5952)
+++ branches/nexuiz-2.0/.patchsets	2009-02-24 15:52:23 UTC (rev 5953)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-5949
+revisions_applied = 1-5949,5952-5952

Modified: branches/nexuiz-2.0/data/qcsrc/client/teamradar.qc
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/client/teamradar.qc	2009-02-24 15:40:24 UTC (rev 5952)
+++ branches/nexuiz-2.0/data/qcsrc/client/teamradar.qc	2009-02-24 15:52:23 UTC (rev 5953)
@@ -53,6 +53,8 @@
 
 void draw_teamradar_background(float bg, float fg)
 {
+	float fga;
+	vector fgc;
 	if(bg > 0)
 	{
 		R_BeginPolygon("", 0);
@@ -66,22 +68,31 @@
 	if(fg > 0 && minimapname != "")
 	{
 		if(csqc_flags & CSQC_FLAG_READPICTURE) // not 2.4.2
+		{
+			fga = 1;
+			fgc = '1 1 1' * fg;
 			R_BeginPolygon(minimapname, DRAWFLAG_SCREEN | DRAWFLAG_MIPMAP);
+		}
 		else
+		{
+			fga = fg;
+			fgc = '1 1 1';
 			R_BeginPolygon(minimapname, DRAWFLAG_ADDITIVE);
+		}
+		print(vtos(fgc), "\n");
 		if(v_flipped)
 		{
-			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord3), yinvert(mi_pictexcoord3), '1 1 1', fg);
-			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord2), yinvert(mi_pictexcoord2), '1 1 1', fg);
-			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord1), yinvert(mi_pictexcoord1), '1 1 1', fg);
-			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord0), yinvert(mi_pictexcoord0), '1 1 1', fg);
+			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord3), yinvert(mi_pictexcoord3), fgc, fga);
+			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord2), yinvert(mi_pictexcoord2), fgc, fga);
+			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord1), yinvert(mi_pictexcoord1), fgc, fga);
+			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord0), yinvert(mi_pictexcoord0), fgc, fga);
 		}
 		else
 		{
-			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord0), yinvert(mi_pictexcoord0), '1 1 1', fg);
-			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord1), yinvert(mi_pictexcoord1), '1 1 1', fg);
-			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord2), yinvert(mi_pictexcoord2), '1 1 1', fg);
-			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord3), yinvert(mi_pictexcoord3), '1 1 1', fg);
+			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord0), yinvert(mi_pictexcoord0), fgc, fga);
+			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord1), yinvert(mi_pictexcoord1), fgc, fga);
+			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord2), yinvert(mi_pictexcoord2), fgc, fga);
+			R_PolygonVertex(teamradar_texcoord_to_2dcoord(mi_pictexcoord3), yinvert(mi_pictexcoord3), fgc, fga);
 		}
 		R_EndPolygon();
 	}