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/decks.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/decks.h')
| -rw-r--r-- | crawl-ref/source/decks.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/crawl-ref/source/decks.h b/crawl-ref/source/decks.h index 8c13c4bcfd..d942355cca 100644 --- a/crawl-ref/source/decks.h +++ b/crawl-ref/source/decks.h @@ -146,6 +146,10 @@ int cards_in_deck(const item_def &deck); card_type get_card_and_flags(const item_def& deck, int idx, uint8_t& _flags); +// Used elsewhere in Zotdef +void _create_pond(const coord_def& center, int radius, bool allow_deep); +void _sage_card(int power, deck_rarity_type rarity); + const std::vector<card_type> get_drawn_cards(const item_def& deck); #endif |