summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/showsymb.h
diff options
context:
space:
mode:
authorLuca Barbieri <luca@luca-barbieri.com>2010-06-07 06:46:42 +0200
committerRobert Vollmert <rvollmert@gmx.net>2010-07-29 00:43:59 +0200
commitaf76f809d3f1679210469c3b194f1b06dc85536b (patch)
treeeadc06efba7cf8bb94ab139fa3b8e5d538e6ef10 /crawl-ref/source/showsymb.h
parent7184b88d886d74490447b01699bd2f95dc9cc804 (diff)
downloadcrawl-ref-af76f809d3f1679210469c3b194f1b06dc85536b.tar.gz
crawl-ref-af76f809d3f1679210469c3b194f1b06dc85536b.zip
Make map_cell store feat+cloud+item+mons instead of only the topmost one (BREAKS SAVES) (v3)
Changes in v3 (rob): - update to current master - fix colouring of out-of-LOS clouds - fix reload crash due to env.cgrid Changes in v2: - Features and monsters should now be properly grayed Currently map_cell only stores the topmost "thing" in a cell. This is good enough for the console view, but not for more sophisticated clients (e.g. tiles). This commit refactors the code so that all player knowledge about a cell (including detailed monster and item information) is represented in map_cell, and so that map_cell is used to build the console view. Save compatibility is broken since the new map_cell is serialized instead of the old one. This will allow, for instance, to load console savegames in the tiles version, and still get proper tiles for the explored area. Furthermore, this new map_cell will be the basis of the Crawl protocol for the client/server split. Signed-off-by: Robert Vollmert <rvollmert@gmx.net>
Diffstat (limited to 'crawl-ref/source/showsymb.h')
-rw-r--r--crawl-ref/source/showsymb.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/showsymb.h b/crawl-ref/source/showsymb.h
index b7ea9d195e..ba096a7405 100644
--- a/crawl-ref/source/showsymb.h
+++ b/crawl-ref/source/showsymb.h
@@ -17,6 +17,9 @@ unsigned get_feat_symbol(dungeon_feature_type feat);
unsigned get_item_symbol(show_item_type it);
glyph get_item_glyph(const item_def *item);
glyph get_mons_glyph(const monster_info& mi, bool realcol=true);
-glyph get_cell_glyph(const map_cell& cell, bool clean_map = false);
+
+show_class get_cell_show_class(const map_cell& cell, bool only_stationary_monsters = false);
+glyph get_cell_glyph(const map_cell& cell, bool only_stationary_monsters = false, int color_mode = 0);
+glyph get_cell_glyph_with_class(const map_cell& cell, show_class cls, int color_mode = 0);
#endif