diff options
| author | Shmuale Mark <shm.mark@gmail.com> | 2014-02-26 20:52:32 -0500 |
|---|---|---|
| committer | Shmuale Mark <shm.mark@gmail.com> | 2014-05-30 13:27:44 -0400 |
| commit | 5f570ca36cc6af95c23ddfda6fe1cd5efb71661a (patch) | |
| tree | 407015b2b5192d7c29a8922a6f3d28a96870c01e /crawl-ref/source/describe.cc | |
| parent | 82193a2d1ca3e754cd6b398177d6293ae9afde85 (diff) | |
| download | crawl-ref-5f570ca36cc6af95c23ddfda6fe1cd5efb71661a.tar.gz crawl-ref-5f570ca36cc6af95c23ddfda6fe1cd5efb71661a.zip | |
Remove dart traps.
They had minimal damage and mechanical traps hardly generate anywhere
anyway. In ossuaries (the only vaults with them, thank god), they've
been mostly replaced with arrow traps or the floor.
Diffstat (limited to 'crawl-ref/source/describe.cc')
| -rw-r--r-- | crawl-ref/source/describe.cc | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/crawl-ref/source/describe.cc b/crawl-ref/source/describe.cc index 02044059e2..f28b34939e 100644 --- a/crawl-ref/source/describe.cc +++ b/crawl-ref/source/describe.cc @@ -547,7 +547,10 @@ static string _randart_descrip(const item_def &item) static const char *trap_names[] = { - "dart", "arrow", "spear", +#if TAG_MAJOR_VERSION == 34 + "dart", +#endif + "arrow", "spear", "teleport", "alarm", "blade", "bolt", "net", "Zot", "needle", "shaft", "passage", "pressure plate", "web", @@ -560,7 +563,13 @@ string trap_name(trap_type trap) { COMPILE_CHECK(ARRAYSZ(trap_names) == NUM_TRAPS); - if (trap >= TRAP_DART && trap < NUM_TRAPS) + if ( +#if TAG_MAJOR_VERSION == 34 + trap >= TRAP_DART +#else + trap >= TRAP_ARROW +#endif + && trap < NUM_TRAPS) return trap_names[trap]; return ""; } |