diff options
| author | mark <mark@ubuntu.(none)> | 2010-11-10 18:56:05 +0000 |
|---|---|---|
| committer | Mark Mackey <mark@swallowtail.org> | 2010-11-10 21:23:33 +0000 |
| commit | 2eb4bbe48fd1767ff147725d0606d6702076e1eb (patch) | |
| tree | 99974c03ced3ec91810faa96b1e718ba9285e348 /crawl-ref/source/traps.h | |
| parent | a2e8e47f6452e66a34595478ae625fdf8f775313 (diff) | |
| parent | 4080d7d1ebf51243d9da41fc2b10790858bb6bc7 (diff) | |
| download | crawl-ref-2eb4bbe48fd1767ff147725d0606d6702076e1eb.tar.gz crawl-ref-2eb4bbe48fd1767ff147725d0606d6702076e1eb.zip | |
Merge branch 'zotdef-0.6' into zotdef-master
Much manual merging, and a few fixes for changes in the code (particularly
monsters->monster and the like). Now compiles and seems to work. Zot Def
added to start menu.
Diffstat (limited to 'crawl-ref/source/traps.h')
| -rw-r--r-- | crawl-ref/source/traps.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crawl-ref/source/traps.h b/crawl-ref/source/traps.h index f903ef9185..6b615f0dce 100644 --- a/crawl-ref/source/traps.h +++ b/crawl-ref/source/traps.h @@ -51,4 +51,5 @@ trap_type random_trap_slime(int level_number = -1); int traps_zero_number(int level_number = -1); +int count_traps(trap_type ttyp); #endif |