diff options
| author | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-26 11:47:35 +0000 |
|---|---|---|
| committer | haranp <haranp@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-07-26 11:47:35 +0000 |
| commit | 24936f8280fcee3d0503c66d9d1e117c3d279d6f (patch) | |
| tree | f15affc2b9eeeceb086442da7714c865252cb6bf /crawl-ref/source/itemname.cc | |
| parent | dae15d11b2a27f9310bf49f0e421fd267f713f28 (diff) | |
| download | crawl-ref-24936f8280fcee3d0503c66d9d1e117c3d279d6f.tar.gz crawl-ref-24936f8280fcee3d0503c66d9d1e117c3d279d6f.zip | |
Added rod of venom [1701655]. Redid some braindead staff handling.
Breaks savefiles.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@1932 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index 48ea28531f..a82f598bad 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -867,6 +867,7 @@ static const char* staff_type_name(int stafftype) { switch (static_cast<stave_type>(stafftype)) { + // staves case STAFF_WIZARDRY: return "wizardry"; case STAFF_POWER: return "power"; @@ -877,22 +878,26 @@ static const char* staff_type_name(int stafftype) case STAFF_DEATH: return "death"; case STAFF_CONJURATION: return "conjuration"; case STAFF_ENCHANTMENT: return "enchantment"; - case STAFF_SMITING: return "smiting"; - case STAFF_STRIKING: return "striking"; - case STAFF_WARDING: return "warding"; - case STAFF_DISCOVERY: return "discovery"; - case STAFF_DEMONOLOGY: return "demonology"; case STAFF_AIR: return "air"; case STAFF_EARTH: return "earth"; case STAFF_SUMMONING: return "summoning"; + // rods case STAFF_SPELL_SUMMONING: return "summoning"; + case STAFF_CHANNELING: return "channeling"; + case STAFF_WARDING: return "warding"; + case STAFF_DISCOVERY: return "discovery"; + case STAFF_SMITING: return "smiting"; + case STAFF_STRIKING: return "striking"; + case STAFF_DEMONOLOGY: return "demonology"; + case STAFF_VENOM: return "venom"; + case STAFF_DESTRUCTION_I: case STAFF_DESTRUCTION_II: case STAFF_DESTRUCTION_III: case STAFF_DESTRUCTION_IV: return "destruction"; - case STAFF_CHANNELING: return "channeling"; + default: return "bugginess"; } } |