]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
For the itemstime panel, use existing strength and shield icons instead of adding...
authorSeverin Meyer <sev.ch@web.de>
Wed, 12 Aug 2015 00:28:55 +0000 (02:28 +0200)
committerSeverin Meyer <sev.ch@web.de>
Wed, 12 Aug 2015 00:28:55 +0000 (02:28 +0200)
gfx/hud/default/item_shield.tga [deleted file]
gfx/hud/default/item_strength.tga [deleted file]
gfx/hud/default/shield.tga
gfx/hud/default/strength.tga
gfx/hud/old/item_shield.tga [deleted file]
gfx/hud/old/item_strength.tga [deleted file]
qcsrc/client/hud.qc

diff --git a/gfx/hud/default/item_shield.tga b/gfx/hud/default/item_shield.tga
deleted file mode 100644 (file)
index da87b64..0000000
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 (file)
index ed0e8a8..0000000
Binary files a/gfx/hud/default/item_strength.tga and /dev/null differ
index f13f0b4d84124f0c5e0f1c02f594edc852f30bdb..4b479d5ecf08d631ead3b67f47d41d8178e8c1d7 100644 (file)
Binary files a/gfx/hud/default/shield.tga and b/gfx/hud/default/shield.tga differ
index b19019d5d7e5c6f81ea7f08f3cd5342299a941c9..d47464de62d22d988b4cd0fad8860c9347fe54e0 100644 (file)
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 (file)
index 58cb73b..0000000
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 (file)
index 0f7689d..0000000
Binary files a/gfx/hud/old/item_strength.tga and /dev/null differ
index c422892ea3cb0baea1593245a19eb9477f9a980b..e18b705fa2654b1c1c2bdeb8a1efd8acdd188480 100644 (file)
@@ -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";