diff options
| author | Adam Borowski <kilobyte@angband.pl> | 2011-12-28 02:43:54 +0100 |
|---|---|---|
| committer | Adam Borowski <kilobyte@angband.pl> | 2011-12-28 02:43:54 +0100 |
| commit | 7b3785d07791141787a0eac6137cb5c98e1d210c (patch) | |
| tree | eee9a6aa9715f1569fddc102a15f578df2138902 /crawl-ref/source/mapdef.h | |
| parent | 2cf8a18928f1c553efb5dffb1ab5b76b50731370 (diff) | |
| parent | efb6b1fd7b0c5027acd6d6ecede9bb34dfbea356 (diff) | |
| download | crawl-ref-7b3785d07791141787a0eac6137cb5c98e1d210c.tar.gz crawl-ref-7b3785d07791141787a0eac6137cb5c98e1d210c.zip | |
Merge branch 'master' into portal_branches
Diffstat (limited to 'crawl-ref/source/mapdef.h')
| -rw-r--r-- | crawl-ref/source/mapdef.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/crawl-ref/source/mapdef.h b/crawl-ref/source/mapdef.h index c229239bc5..da6daddd33 100644 --- a/crawl-ref/source/mapdef.h +++ b/crawl-ref/source/mapdef.h @@ -226,7 +226,6 @@ public: map_featheight_list fheights; }; -#ifdef USE_TILE typedef std::pair<std::string, int> map_weighted_tile; class map_tile_list : public std::vector<map_weighted_tile> { @@ -256,7 +255,6 @@ public: std::string fixed_tile; map_tile_list tiles; }; -#endif class map_marker_spec { @@ -348,11 +346,9 @@ public: void write_maplines(writer &) const; void read_maplines(reader&); -#ifdef USE_TILE std::string add_floortile(const std::string &s); std::string add_rocktile(const std::string &s); std::string add_spec_tile(const std::string &s); -#endif std::vector<coord_def> find_glyph(const std::string &glyphs) const; std::vector<coord_def> find_glyph(int glyph) const; @@ -457,9 +453,7 @@ private: void merge_cell(int x, int y, const map_def &vault, int vx, int vy, int keyspec_idx); -#ifdef USE_TILE void overlay_tiles(tile_spec &); -#endif void check_borders(); std::string shuffle(std::string s); std::string block_shuffle(const std::string &s); @@ -474,9 +468,7 @@ private: std::string parse_glyph_replacements(std::string s, glyph_replacements_t &gly); -#ifdef USE_TILE std::string add_tile(const std::string &sub, bool is_floor, bool is_feat); -#endif std::string add_key_field( const std::string &s, |