summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorChris Oelmueller <chris.oelmueller@gmail.com>2014-04-13 03:25:21 +0200
committerShmuale Mark <shm.mark@gmail.com>2014-05-05 21:27:51 -0400
commit3da635bd8450af0fddbfd5c182afe593938136f2 (patch)
tree3f33a49f2a40312fec9b1cebd3a5fa09ec506ff1 /crawl-ref/source/initfile.cc
parent332536bcd766995a9ad19bd580f9ad96df1e0863 (diff)
downloadcrawl-ref-3da635bd8450af0fddbfd5c182afe593938136f2.tar.gz
crawl-ref-3da635bd8450af0fddbfd5c182afe593938136f2.zip
Rename "bow" to "shortbow"
For a clear distinction of "bows" the skill, and from "longbow" the weapon.
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index 7e8cefa5f4..4e9b712be7 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -224,8 +224,8 @@ weapon_type str_to_weapon(const string &str)
return WPN_UNARMED;
else if (str == "sling")
return WPN_SLING;
- else if (str == "bow")
- return WPN_BOW;
+ else if (str == "shortbow" || str == "short bow")
+ return WPN_SHORTBOW;
else if (str == "crossbow")
return WPN_CROSSBOW;
else if (str == "thrown"
@@ -273,8 +273,8 @@ static string _weapon_to_str(int weapon)
return "claws";
case WPN_SLING:
return "sling";
- case WPN_BOW:
- return "bow";
+ case WPN_SHORTBOW:
+ return "shortbow";
case WPN_CROSSBOW:
return "crossbow";
case WPN_THROWN: