From: Severin Meyer <sev.ch@web.de>
Date: Wed, 12 Aug 2015 00:28:55 +0000 (+0200)
Subject: For the itemstime panel, use existing strength and shield icons instead of adding... 
X-Git-Tag: xonotic-v0.8.1~7^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f15107492032142201de258bbac77b4d7b4d8f92;p=xonotic%2Fxonotic-data.pk3dir.git

For the itemstime panel, use existing strength and shield icons instead of adding new ones
---

diff --git a/gfx/hud/default/item_shield.tga b/gfx/hud/default/item_shield.tga
deleted file mode 100644
index da87b648e..000000000
Binary files a/gfx/hud/default/item_shield.tga and /dev/null differ
diff --git a/gfx/hud/default/item_strength.tga b/gfx/hud/default/item_strength.tga
deleted file mode 100644
index ed0e8a8d8..000000000
Binary files a/gfx/hud/default/item_strength.tga and /dev/null differ
diff --git a/gfx/hud/default/shield.tga b/gfx/hud/default/shield.tga
index f13f0b4d8..4b479d5ec 100644
Binary files a/gfx/hud/default/shield.tga and b/gfx/hud/default/shield.tga differ
diff --git a/gfx/hud/default/strength.tga b/gfx/hud/default/strength.tga
index b19019d5d..d47464de6 100644
Binary files a/gfx/hud/default/strength.tga and b/gfx/hud/default/strength.tga differ
diff --git a/gfx/hud/old/item_shield.tga b/gfx/hud/old/item_shield.tga
deleted file mode 100644
index 58cb73ba3..000000000
Binary files a/gfx/hud/old/item_shield.tga and /dev/null differ
diff --git a/gfx/hud/old/item_strength.tga b/gfx/hud/old/item_strength.tga
deleted file mode 100644
index 0f7689d21..000000000
Binary files a/gfx/hud/old/item_strength.tga and /dev/null differ
diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index c422892ea..e18b705fa 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -4615,11 +4615,11 @@ string GetItemsTimePicture(float i)
 	{
 		case 0: return "item_large_armor";
 		case 1: return "item_mega_health";
-		case 2: return "item_strength";
-		case 3: return "item_shield";
+		case 2: return "strength";
+		case 3: return "shield";
 		case 4: return "item_mega_health";
-		case 5: return "item_strength";
-		case 6: return "item_shield";
+		case 5: return "strength";
+		case 6: return "shield";
 		case 7: return "fuelregen";
 		case 8: return "jetpack";
 		case 9: return "superweapons";