From: Severin Meyer <sev.ch@web.de>
Date: Tue, 28 Jul 2015 19:54:54 +0000 (+0200)
Subject: Use consistent names
X-Git-Tag: xonotic-v0.8.1~32^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9ae2f83904bbb966b5b5122a602e18fe080140bc;p=xonotic%2Fxonotic-data.pk3dir.git

Use consistent names
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index b960649b6..d8995c656 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -976,7 +976,7 @@ void DrawAmmoNades(vector myPos, vector mySize, bool draw_expanding, float expan
 	float bonusProgress = getstatf(STAT_NADE_BONUS_SCORE);
 	float bonusType     = getstati(STAT_NADE_BONUS_TYPE);
 	vector nadeColor    = Nade_Color(bonusType);
-	string nadePic      = Nade_Pic(bonusType);
+	string nadeIcon     = Nade_Icon(bonusType);
 
 	vector iconPos, textPos;
 
@@ -999,9 +999,9 @@ void DrawAmmoNades(vector myPos, vector mySize, bool draw_expanding, float expan
 			drawstring_aspect(textPos, ftos(bonusNades), eX * (2/3) * mySize.x + eY * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 
 		if(draw_expanding)
-			drawpic_aspect_skin_expanding(iconPos, nadePic, '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, expand_time);
+			drawpic_aspect_skin_expanding(iconPos, nadeIcon, '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL, expand_time);
 
-		drawpic_aspect_skin(iconPos, nadePic, '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
+		drawpic_aspect_skin(iconPos, nadeIcon, '1 1 0' * mySize.y, '1 1 1', panel_fg_alpha, DRAWFLAG_NORMAL);
 	}
 }
 
diff --git a/qcsrc/common/nades.qh b/qcsrc/common/nades.qh
index 7daca159d..fe07101a3 100644
--- a/qcsrc/common/nades.qh
+++ b/qcsrc/common/nades.qh
@@ -47,7 +47,7 @@ vector Nade_Color(int nadeid)
 	return '0 0 0';
 }
 
-string Nade_Pic(int nadeid)
+string Nade_Icon(int nadeid)
 {
 	switch(nadeid)
 	{