diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 04:01:42 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2013-05-29 04:01:42 +0200 |
| commit | aff44e3dcf63bf0a5426c8d6998c8954bb44d26d (patch) | |
| tree | 1708e320052e6631f93e85301ff6d2ad75ebb1ef /crawl-ref/source/tilecell.h | |
| parent | 30cd027a1c26d7375360584f5df8ec9f57a09c85 (diff) | |
| parent | 1ef5305b68a6936247e5ee2a4aa7516222258490 (diff) | |
| download | crawl-ref-aff44e3dcf63bf0a5426c8d6998c8954bb44d26d.tar.gz crawl-ref-aff44e3dcf63bf0a5426c8d6998c8954bb44d26d.zip | |
Merge branch 'master' into lava_orcs
Diffstat (limited to 'crawl-ref/source/tilecell.h')
| -rw-r--r-- | crawl-ref/source/tilecell.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/crawl-ref/source/tilecell.h b/crawl-ref/source/tilecell.h index 44bf478c38..94a26988e2 100644 --- a/crawl-ref/source/tilecell.h +++ b/crawl-ref/source/tilecell.h @@ -21,6 +21,7 @@ struct packed_cell tileidx_t fg; tileidx_t bg; tile_flavour flv; + tileidx_t cloud; bool is_bloody; bool is_silenced; @@ -36,13 +37,13 @@ struct packed_cell bool old_blood; uint8_t travel_trail; bool quad_glow; - bool disjunct; + uint8_t disjunct; uint8_t heat_aura; bool operator ==(const packed_cell &other) const; bool operator !=(const packed_cell &other) const { return !(*this == other); } - packed_cell() : num_dngn_overlay(0), fg(0), bg(0), is_bloody(false), + packed_cell() : num_dngn_overlay(0), fg(0), bg(0), cloud(0), is_bloody(false), is_silenced(false), is_suppressed(false), halo(HALO_NONE), is_moldy(false), glowing_mold(false), is_sanctuary(false), is_liquefied(false), mangrove_water(false), orb_glow(0), @@ -51,6 +52,7 @@ struct packed_cell packed_cell(const packed_cell* c) : num_dngn_overlay(c->num_dngn_overlay), fg(c->fg), bg(c->bg), flv(c->flv), + cloud(c->cloud), is_bloody(c->is_bloody), is_silenced(c->is_silenced), is_suppressed(c->is_suppressed), |