diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2012-03-26 23:51:31 +0200 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2012-03-26 23:56:36 +0200 |
| commit | 2c8c99fec4aab48970d75030ece87dda40260e78 (patch) | |
| tree | ed687319685e936cb25b8fa046c01209c36c7525 /crawl-ref/source/env.h | |
| parent | 01c2aa8463804cdd4ff8818b78c1deb890a78efb (diff) | |
| parent | 537a8dfbb6582c8269e3239b63a5d2ea03eb77a3 (diff) | |
| download | crawl-ref-2c8c99fec4aab48970d75030ece87dda40260e78.tar.gz crawl-ref-2c8c99fec4aab48970d75030ece87dda40260e78.zip | |
Merge branch 'master' into portal_branches
This includes fixes for 64834896234968 places in master that add new uses of
LEVEL_FOO and so on.
Diffstat (limited to 'crawl-ref/source/env.h')
| -rw-r--r-- | crawl-ref/source/env.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/env.h b/crawl-ref/source/env.h index 12d547a40d..2c9a29a049 100644 --- a/crawl-ref/source/env.h +++ b/crawl-ref/source/env.h @@ -17,8 +17,8 @@ typedef std::vector<vault_placement*> vault_placement_refv; struct crawl_environment { - uint8_t rock_colour; - uint8_t floor_colour; + colour_t rock_colour; + colour_t floor_colour; FixedVector< item_def, MAX_ITEMS > item; // item list FixedVector< monster, MAX_MONSTERS+1 > mons; // monster list, plus anon |