summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source
diff options
context:
space:
mode:
authorennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-12 04:16:44 +0000
committerennewalker <ennewalker@c06c8d41-db1a-0410-9941-cceddc491573>2008-09-12 04:16:44 +0000
commitd6f1809d57b5ebd88f9aeeecd80b416aec6f73bb (patch)
tree19e5d449ef5532cdea9fee7498b5f56506a214ea /crawl-ref/source
parent7c1e0016bfbaf83edc7ced6c18525b02cef706e8 (diff)
downloadcrawl-ref-d6f1809d57b5ebd88f9aeeecd80b416aec6f73bb.tar.gz
crawl-ref-d6f1809d57b5ebd88f9aeeecd80b416aec6f73bb.zip
Using new bardiche tile instead of old lochaber axe one.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@6911 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
-rw-r--r--crawl-ref/source/rltiles/dc-item.txt1
-rw-r--r--crawl-ref/source/rltiles/item/weapon/lochaber_axe.pngbin412 -> 0 bytes
-rw-r--r--crawl-ref/source/tilepick.cc2
3 files changed, 1 insertions, 2 deletions
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index 81319a5d18..04880b802c 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -154,7 +154,6 @@ blessed_blade WPN_BLESSED_BLADE
longbow WPN_LONGBOW
lajatang WPN_LAJATANG
lajatang2
-lochaber_axe WPN_LOCHABER_AXE
######OBJ_MISSILES
item/gem/stone MI_STONE /* D2H4 A stone.
diff --git a/crawl-ref/source/rltiles/item/weapon/lochaber_axe.png b/crawl-ref/source/rltiles/item/weapon/lochaber_axe.png
deleted file mode 100644
index 2cb059e840..0000000000
--- a/crawl-ref/source/rltiles/item/weapon/lochaber_axe.png
+++ /dev/null
Binary files differ
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 02afac3ca2..9d36142b79 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -1161,7 +1161,7 @@ static int _tileidx_weapon_base(const item_def &item)
return TILE_WPN_LAJATANG;
case WPN_BARDICHE:
- return TILE_WPN_LOCHABER_AXE;
+ return TILE_WPN_BARDICHE;
case WPN_BLESSED_FALCHION:
return TILE_WPN_FALCHION;