diff options
| author | Stefan O'Rear <stefanor@cox.net> | 2009-11-15 00:04:52 -0800 |
|---|---|---|
| committer | Stefan O'Rear <stefanor@cox.net> | 2009-11-15 00:04:52 -0800 |
| commit | 05010f1d267b268e68821223680f34545c443f5c (patch) | |
| tree | 967466e274aa990271509d232af4a6c1fd0ad1a5 /crawl-ref/source/itemname.cc | |
| parent | dd56050f2d05db6ed7ff5bc99acd1032707c27fd (diff) | |
| parent | 5bba7e89fd395a2cde9cbf596208785508e22331 (diff) | |
| download | crawl-ref-05010f1d267b268e68821223680f34545c443f5c.tar.gz crawl-ref-05010f1d267b268e68821223680f34545c443f5c.zip | |
Merge Johnny Shelley's arcane marksman patch
Diffstat (limited to 'crawl-ref/source/itemname.cc')
| -rw-r--r-- | crawl-ref/source/itemname.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/crawl-ref/source/itemname.cc b/crawl-ref/source/itemname.cc index ea9c56062e..d1b01e9a1e 100644 --- a/crawl-ref/source/itemname.cc +++ b/crawl-ref/source/itemname.cc @@ -13,9 +13,6 @@ #include <ctype.h> #include <string.h> -#ifdef TARGET_OS_DOS -#include <conio.h> -#endif #include "clua.h" #include "externs.h" @@ -847,7 +844,6 @@ static const char* book_type_name(int booktype) case BOOK_SUMMONINGS: return "Summonings"; case BOOK_FIRE: return "Fire"; case BOOK_ICE: return "Ice"; - case BOOK_SURVEYANCES: return "Surveyances"; case BOOK_SPATIAL_TRANSLOCATIONS: return "Spatial Translocations"; case BOOK_ENCHANTMENTS: return "Enchantments"; case BOOK_TEMPESTS: return "the Tempests"; @@ -855,7 +851,6 @@ static const char* book_type_name(int booktype) case BOOK_HINDERANCE: return "Hinderance"; case BOOK_CHANGES: return "Changes"; case BOOK_TRANSFIGURATIONS: return "Transfigurations"; - case BOOK_PRACTICAL_MAGIC: return "Practical Magic"; case BOOK_WAR_CHANTS: return "War Chants"; case BOOK_CLOUDS: return "Clouds"; case BOOK_NECROMANCY: return "Necromancy"; @@ -864,7 +859,6 @@ static const char* book_type_name(int booktype) case BOOK_DEMONOLOGY: return "Demonology"; case BOOK_AIR: return "Air"; case BOOK_SKY: return "the Sky"; - case BOOK_DIVINATIONS: return "Divinations"; case BOOK_WARP: return "the Warp"; case BOOK_ENVENOMATIONS: return "Envenomations"; case BOOK_ANNIHILATIONS: return "Annihilations"; @@ -884,7 +878,6 @@ static const char* book_type_name(int booktype) case BOOK_DEVASTATING_MISSILES: return "Devastating Missiles"; case BOOK_RANDART_LEVEL: return "Fixed Level"; case BOOK_RANDART_THEME: return "Fixed Theme"; - case BOOK_CARD_EFFECT: return "Card Effects"; default: return "Bugginess"; } } |