summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/initfile.cc
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-11 11:23:33 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-04-11 11:23:33 +0000
commit7896dbd29bda379c2fb31feeb3b16bda57039c00 (patch)
treed7f820c06e503416aa61dee002c9358c24ade813 /crawl-ref/source/initfile.cc
parent0fe8afdd2c0c0bcac82f6f1237181dc6fb1c58c2 (diff)
downloadcrawl-ref-7896dbd29bda379c2fb31feeb3b16bda57039c00.tar.gz
crawl-ref-7896dbd29bda379c2fb31feeb3b16bda57039c00.zip
Fix 1937869: Have weapon swapping respect spells the character knows
and allow wielding the appropriate items, e.g. arrows for Sticks to Snakes etc. Use the same rules for clicking on items in Tiles. Also add yet another minimap colour option, this time for plants (really zero xp monsters in general) since I became tired of plant-rich vaults showing up in bright red colours. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@4195 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/initfile.cc')
-rw-r--r--crawl-ref/source/initfile.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc
index cf0edbb097..519f5feb15 100644
--- a/crawl-ref/source/initfile.cc
+++ b/crawl-ref/source/initfile.cc
@@ -813,6 +813,7 @@ void game_options::reset_options()
tile_monster_col = MAP_RED;
tile_neutral_col = MAP_RED;
tile_friendly_col = MAP_LTRED;
+ tile_plant_col = MAP_DKGREEN;
tile_item_col = MAP_GREEN;
tile_unseen_col = MAP_BLACK;
tile_floor_col = MAP_LTGREY;
@@ -2580,6 +2581,11 @@ void game_options::read_option_line(const std::string &str, bool runscript)
tile_friendly_col =
_str_to_tile_colour(field);
}
+ else if (key == "tile_plant_col")
+ {
+ tile_plant_col =
+ _str_to_tile_colour(field);
+ }
else if (key == "tile_item_col")
{
tile_item_col =