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/mapdef.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/mapdef.h')
| -rw-r--r-- | crawl-ref/source/mapdef.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h index c13c3d7f83..d5a5a457ce 100644 --- a/crawl-ref/source/mapdef.h +++ b/crawl-ref/source/mapdef.h @@ -301,9 +301,6 @@ public: map_string_list strlist; }; -template<class T> -std::string parse_weighted_str(const std::string &cspec, T &list); - class map_def; class rectangle_iterator; struct keyed_mapspec; @@ -1127,7 +1124,7 @@ public: map_def *original; - uint8_t rock_colour, floor_colour; + colour_t rock_colour, floor_colour; std::string rock_tile, floor_tile; dungeon_feature_type border_fill_type; |