diff options
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/externs.h | 1 | ||||
| -rw-r--r-- | crawl-ref/source/initfile.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/invent.cc | 3 | ||||
| -rw-r--r-- | crawl-ref/source/menu.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/tilereg.cc | 8 |
5 files changed, 17 insertions, 3 deletions
diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h index d85896d220..05c5120d2f 100644 --- a/crawl-ref/source/externs.h +++ b/crawl-ref/source/externs.h @@ -2193,6 +2193,7 @@ public: #ifdef USE_TILE char tile_show_items[20]; // show which item types in tile inventory bool tile_title_screen; // display title screen? + bool tile_menu_icons; // display icons in menus? // minimap colours char tile_player_col; char tile_monster_col; diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 08f7546915..30e77385b6 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -894,6 +894,7 @@ void game_options::reset_options() #ifdef USE_TILE strcpy(tile_show_items, "!?/%=([)x}+\\_."); tile_title_screen = true; + tile_menu_icons = true; // minimap colours tile_player_col = MAP_WHITE; tile_monster_col = MAP_RED; @@ -3024,6 +3025,7 @@ void game_options::read_option_line(const std::string &str, bool runscript) strncpy(tile_show_items, field.c_str(), 18); } else BOOL_OPTION(tile_title_screen); + else BOOL_OPTION(tile_menu_icons); else if (key == "tile_player_col") { tile_player_col = diff --git a/crawl-ref/source/invent.cc b/crawl-ref/source/invent.cc index f392c9d429..45b22896c0 100644 --- a/crawl-ref/source/invent.cc +++ b/crawl-ref/source/invent.cc @@ -483,6 +483,9 @@ void InvMenu::load_inv_items(int item_selector, int excluded_slot, #ifdef USE_TILE bool InvEntry::get_tiles(std::vector<tile_def>& tileset) const { + if (!Options.tile_menu_icons) + return (false); + if (quantity <= 0) return (false); diff --git a/crawl-ref/source/menu.cc b/crawl-ref/source/menu.cc index 20c45769e7..3ae400beeb 100644 --- a/crawl-ref/source/menu.cc +++ b/crawl-ref/source/menu.cc @@ -721,6 +721,9 @@ bool MenuEntry::get_tiles(std::vector<tile_def>& tileset) const bool MonsterMenuEntry::get_tiles(std::vector<tile_def>& tileset) const { + if (!Options.tile_menu_icons) + return (false); + monsters *m = (monsters*)(data); if (!m) return (false); @@ -805,6 +808,9 @@ bool MonsterMenuEntry::get_tiles(std::vector<tile_def>& tileset) const bool FeatureMenuEntry::get_tiles(std::vector<tile_def>& tileset) const { + if (!Options.tile_menu_icons) + return (false); + if (!in_bounds(pos)) return (false); diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 04a3b08a82..4e5a2e06bb 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -2596,9 +2596,9 @@ void MenuRegion::place_entries() { m_dirty = false; - const int heading_indent = 10; - const int tile_indent = 20; - const int text_indent = 58; + const int heading_indent = 10; + const int tile_indent = 20; + const int text_indent = (Options.tile_menu_icons ? 58 : 20); const int max_tile_height = 32; const int entry_buffer = 1; const VColour selected_colour(50, 50, 10, 255); @@ -2610,6 +2610,8 @@ void MenuRegion::place_entries() m_tile_buf[t].clear(); int column = 0; + if (!Options.tile_menu_icons) + set_num_columns(1); const int max_columns = std::min(2, m_max_columns); const int column_width = mx / max_columns; |