From: terencehill <piuntn@gmail.com>
Date: Fri, 9 Sep 2016 19:12:31 +0000 (+0200)
Subject: Remove tga extension from CA icons
X-Git-Tag: xonotic-v0.8.2~609
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b32eb7b11a27ac13f205b13ece8e633b2e9c423c;p=xonotic%2Fxonotic-data.pk3dir.git

Remove tga extension from CA icons
---

diff --git a/qcsrc/client/hud/panel/modicons.qc b/qcsrc/client/hud/panel/modicons.qc
index a4d84cf9e..c3310b25a 100644
--- a/qcsrc/client/hud/panel/modicons.qc
+++ b/qcsrc/client/hud/panel/modicons.qc
@@ -16,27 +16,11 @@ void DrawCAItem(vector myPos, vector mySize, float aspect_ratio, int layout, int
 	vector color = '0 0 0';
 	switch(i)
 	{
-		case 0:
-			stat = STAT(REDALIVE);
-			pic = "player_red.tga";
-			color = '1 0 0';
-			break;
-		case 1:
-			stat = STAT(BLUEALIVE);
-			pic = "player_blue.tga";
-			color = '0 0 1';
-			break;
-		case 2:
-			stat = STAT(YELLOWALIVE);
-			pic = "player_yellow.tga";
-			color = '1 1 0';
-			break;
+		case 0: stat = STAT(REDALIVE); pic = "player_red"; color = '1 0 0'; break;
+		case 1: stat = STAT(BLUEALIVE); pic = "player_blue"; color = '0 0 1'; break;
+		case 2: stat = STAT(YELLOWALIVE); pic = "player_yellow"; color = '1 1 0'; break;
 		default:
-		case 3:
-			stat = STAT(PINKALIVE);
-			pic = "player_pink.tga";
-			color = '1 0 1';
-			break;
+		case 3: stat = STAT(PINKALIVE); pic = "player_pink"; color = '1 0 1'; break;
 	}
 
 	if(mySize.x/mySize.y > aspect_ratio)
@@ -654,27 +638,11 @@ void DrawDomItem(vector myPos, vector mySize, float aspect_ratio, int layout, in
 	vector color = '0 0 0';
 	switch(i)
 	{
-		case 0:
-			stat = STAT(DOM_PPS_RED);
-			pic = "dom_icon_red";
-			color = '1 0 0';
-			break;
-		case 1:
-			stat = STAT(DOM_PPS_BLUE);
-			pic = "dom_icon_blue";
-			color = '0 0 1';
-			break;
-		case 2:
-			stat = STAT(DOM_PPS_YELLOW);
-			pic = "dom_icon_yellow";
-			color = '1 1 0';
-			break;
+		case 0: stat = STAT(DOM_PPS_RED); pic = "dom_icon_red"; color = '1 0 0'; break;
+		case 1: stat = STAT(DOM_PPS_BLUE); pic = "dom_icon_blue"; color = '0 0 1'; break;
+		case 2: stat = STAT(DOM_PPS_YELLOW); pic = "dom_icon_yellow"; color = '1 1 0'; break;
 		default:
-		case 3:
-			stat = STAT(DOM_PPS_PINK);
-			pic = "dom_icon_pink";
-			color = '1 0 1';
-			break;
+		case 3: stat = STAT(DOM_PPS_PINK); pic = "dom_icon_pink"; color = '1 0 1'; break;
 	}
 	float pps_ratio = 0;
 	if(STAT(DOM_TOTAL_PPS))