diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2009-10-13 09:56:41 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2009-10-13 09:57:09 +0200 |
| commit | 7cb4b819399d86effcf5890498f3e89dcb8a7178 (patch) | |
| tree | d591f28e24caaf7196a93dbf7f02deb727413f9f /crawl-ref/source/enum.h | |
| parent | 072864bdfdb2befa0cb865dbe4234f7f0c8dec39 (diff) | |
| parent | ffa4e38d65ac1f41a20f3820d38c4d54291c9a8f (diff) | |
| download | crawl-ref-7cb4b819399d86effcf5890498f3e89dcb8a7178.tar.gz crawl-ref-7cb4b819399d86effcf5890498f3e89dcb8a7178.zip | |
Merge branch 'trees'.
There's still the issue of glyph choice, and cutting them down with an
axe is not coded yet.
Diffstat (limited to 'crawl-ref/source/enum.h')
| -rw-r--r-- | crawl-ref/source/enum.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index 4d186f9e91..58376fb08c 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -431,6 +431,11 @@ enum cloud_type CLOUD_GREY_SMOKE, CLOUD_BLUE_SMOKE, CLOUD_PURP_SMOKE, + CLOUD_FOREST_FIRE, + + CLOUD_OPAQUE_FIRST = CLOUD_BLACK_SMOKE, + CLOUD_OPAQUE_LAST = CLOUD_FOREST_FIRE, + CLOUD_STEAM, CLOUD_MIASMA, CLOUD_MIST, @@ -945,6 +950,7 @@ enum dungeon_char_type DCHAR_ITEM_GOLD, DCHAR_ITEM_AMULET, // 30 DCHAR_CLOUD, // 31 + DCHAR_TREES, DCHAR_SPACE, DCHAR_FIRED_FLASK, @@ -1016,6 +1022,7 @@ enum dungeon_feature_type // Highest grid value which can't be reached through. DNGN_MAX_NONREACH = DNGN_CLEAR_PERMAROCK_WALL, + DNGN_TREES, DNGN_OPEN_SEA, // Shoals equivalent for permarock // Can be seen through and reached past. @@ -1863,6 +1870,7 @@ enum monster_type // (int) menv[].type MONS_FLAMING_CORPSE, MONS_HARPY, MONS_TOADSTOOL, // 198 + MONS_BUSH, //jmf: end new monsters MONS_WHITE_IMP = 220, // 220 MONS_LEMURE, |