Split up view.cc.

1 files changed, 2 insertions, 84 deletions

diff --git a/crawl-ref/source/view.h b/crawl-ref/source/view.h
index 978fcad050..148cd35fc6 100644
--- a/crawl-ref/source/view.h
+++ b/crawl-ref/source/view.h
@@ -11,7 +11,6 @@
 #include "externs.h"
 #include "show.h"
 
-void init_char_table(char_set_type set);
 void init_monsters_seens();
 
 void beogh_follower_convert(monsters *monster, bool orc_hit = false);
@@ -38,8 +37,6 @@ void handle_monster_shouts(monsters* monster, bool force = false);
 class level_pos;
 void show_map( level_pos &spec_place, bool travel_mode, bool allow_esc = false );
 bool check_awaken(monsters* monster);
-int count_detected_mons(void);
-void clear_map(bool clear_items = true, bool clear_mons = true);
 bool is_feature(int feature, const coord_def& where);
 void get_item_glyph(const item_def *item, unsigned *glych,
                     unsigned short *glycol);
@@ -47,94 +44,20 @@ void get_mons_glyph(const monsters *mons, unsigned *glych,
                     unsigned short *glycol);
 unsigned get_screen_glyph( int x, int y );
 unsigned get_screen_glyph( const coord_def &p );
-std::string stringize_glyph(unsigned glyph);
-int multibyte_strlen(const std::string &s);
 
-// Applies ETC_ colour substitutions and brands.
-unsigned real_colour(unsigned raw_colour);
 int get_mons_colour(const monsters *mons);
 
-void set_envmap_obj(const coord_def& where, show_type object);
-unsigned get_envmap_char(int x, int y);
-inline unsigned get_envmap_char(const coord_def& c) {
-    return get_envmap_char(c.x, c.y);
-}
 bool inside_level_bounds(int x, int y);
 bool inside_level_bounds(const coord_def &p);
-show_type get_envmap_obj(int x, int y);
-inline show_type get_envmap_obj(const coord_def& c) {
-    return get_envmap_obj(c.x, c.y);
-}
-void set_envmap_detected_item(int x, int y, bool detected = true);
-inline void set_envmap_detected_item(const coord_def& c, bool detected = true) {
-    set_envmap_detected_item(c.x, c.y, detected);
-}
-
-void set_envmap_detected_mons(int x, int y, bool detected = true);
-inline void set_envmap_detected_mons(const coord_def& c, bool detected = true) {
-    set_envmap_detected_mons(c.x, c.y, detected);
-}
-void set_envmap_col( int x, int y, int colour, int flags );
-void set_envmap_col( int x, int y, int colour );
-bool is_sanctuary( const coord_def& p );
-bool is_bloodcovered( const coord_def& p );
-
-bool is_envmap_detected_item(int x, int y);
-inline bool is_envmap_detected_item(const coord_def& c) {
-    return is_envmap_detected_item(c.x, c.y);
-}
-
-bool is_envmap_detected_mons(int x, int y);
-inline bool is_envmap_detected_mons(const coord_def& c) {
-    return is_envmap_detected_mons(c.x, c.y);
-}
-bool is_envmap_item(int x, int y);
-inline bool is_envmap_item(const coord_def& c) {
-    return is_envmap_item(c.x, c.y);
-}
-void set_terrain_mapped( int x, int y );
-inline void set_terrain_mapped( const coord_def& c ) {
-    set_terrain_mapped(c.x,c.y);
-}
-void set_terrain_seen( int x, int y );
-inline void set_terrain_seen( const coord_def& c ) {
-    set_terrain_seen(c.x, c.y);
-}
-void set_terrain_changed( int x, int y );
-bool is_terrain_known( int x, int y );
-bool is_terrain_seen( int x, int y );
-bool is_terrain_changed( int x, int y );
-inline bool is_terrain_changed( const coord_def& c ) {
-    return is_terrain_changed(c.x,c.y);
-}
-bool is_terrain_known(const coord_def &p);
-bool is_terrain_mapped(const coord_def &p);
-bool is_notable_terrain(dungeon_feature_type ftype);
-
-inline bool is_terrain_seen(const coord_def &c)
-{
-    return (is_terrain_seen(c.x, c.y));
-}
-
-inline void set_terrain_changed(const coord_def &c)
-{
-    set_terrain_changed(c.x, c.y);
-}
-
 void clear_feature_overrides();
 void add_feature_override(const std::string &text);
-void clear_cset_overrides();
-void add_cset_override(char_set_type set, const std::string &overrides);
 
 unsigned grid_character_at(const coord_def &c);
+unsigned get_symbol(show_type object, unsigned short *colour = NULL,
+                     bool magic_mapped = false);
 
 std::string screenshot(bool fullscreen = false);
 
-dungeon_char_type get_feature_dchar( dungeon_feature_type feat );
-unsigned dchar_glyph(dungeon_char_type dchar);
-unsigned get_sightmap_char(int feature);
-unsigned get_magicmap_char(int feature);
-
 bool view_update();
 void view_update_at(const coord_def &pos);
 #ifndef USE_TILE
@@ -150,9 +73,4 @@ dungeon_char_type dchar_by_name(const std::string &name);
 
 void handle_terminal_resize(bool redraw = true);
 
-#if defined(TARGET_OS_WINDOWS) || defined(TARGET_OS_DOS) || defined(USE_TILE)
-unsigned short dos_brand( unsigned short colour,
-                          unsigned brand = CHATTR_REVERSE);
-#endif
-
 #endif