diff options
author | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2010-01-06 23:43:29 +0100 |
---|---|---|
committer | Johanna Ploog <j-p-e-g@users.sourceforge.net> | 2010-01-07 12:10:43 +0100 |
commit | d6697da62b9cd881b23f3942b26bdf294b9f3515 (patch) | |
tree | 7fe942a79baf2d35ceaed00a1d2e48d556ca3c9b /crawl-ref/source | |
parent | f3dd1c1ca8c0414576ea2b465a8657d550a3cfea (diff) | |
download | crawl-ref-d6697da62b9cd881b23f3942b26bdf294b9f3515.tar.gz crawl-ref-d6697da62b9cd881b23f3942b26bdf294b9f3515.zip |
New minimap colour option for peaceful monsters, by default same as friendly.
Diffstat (limited to 'crawl-ref/source')
-rw-r--r-- | crawl-ref/source/enum.h | 15 | ||||
-rw-r--r-- | crawl-ref/source/initfile.cc | 1 | ||||
-rw-r--r-- | crawl-ref/source/options.h | 1 | ||||
-rw-r--r-- | crawl-ref/source/tilereg.cc | 3 | ||||
-rw-r--r-- | crawl-ref/source/tilesdl.cc | 2 |
5 files changed, 14 insertions, 8 deletions
diff --git a/crawl-ref/source/enum.h b/crawl-ref/source/enum.h index e29eb1d3e1..20afad48f0 100644 --- a/crawl-ref/source/enum.h +++ b/crawl-ref/source/enum.h @@ -1555,23 +1555,24 @@ enum map_feature MF_MAP_WALL, MF_DOOR, // 5 MF_ITEM, - MF_MONS_HOSTILE, MF_MONS_FRIENDLY, + MF_MONS_PEACEFUL, MF_MONS_NEUTRAL, - MF_MONS_NO_EXP, // 10 + MF_MONS_HOSTILE, // 10 + MF_MONS_NO_EXP, MF_STAIR_UP, MF_STAIR_DOWN, MF_STAIR_BRANCH, - MF_FEATURE, - MF_WATER, // 15 + MF_FEATURE, // 15 + MF_WATER, MF_LAVA, MF_TRAP, MF_EXCL_ROOT, - MF_EXCL, - MF_PLAYER, // 20 + MF_EXCL, // 20 + MF_PLAYER, MF_MAX, - MF_SKIP // 22 + MF_SKIP // 23 }; enum menu_type diff --git a/crawl-ref/source/initfile.cc b/crawl-ref/source/initfile.cc index 506e49c56e..c3208c425b 100644 --- a/crawl-ref/source/initfile.cc +++ b/crawl-ref/source/initfile.cc @@ -858,6 +858,7 @@ void game_options::reset_options() tile_player_col = MAP_WHITE; tile_monster_col = MAP_RED; tile_neutral_col = MAP_RED; + tile_peaceful_col = MAP_LTRED; tile_friendly_col = MAP_LTRED; tile_plant_col = MAP_DKGREEN; tile_item_col = MAP_GREEN; diff --git a/crawl-ref/source/options.h b/crawl-ref/source/options.h index b8d331c0cf..2480c78a24 100644 --- a/crawl-ref/source/options.h +++ b/crawl-ref/source/options.h @@ -330,6 +330,7 @@ public: char tile_player_col; char tile_monster_col; char tile_neutral_col; + char tile_peaceful_col; char tile_friendly_col; char tile_plant_col; char tile_item_col; diff --git a/crawl-ref/source/tilereg.cc b/crawl-ref/source/tilereg.cc index 87d9e20508..14161323e3 100644 --- a/crawl-ref/source/tilereg.cc +++ b/crawl-ref/source/tilereg.cc @@ -2947,9 +2947,10 @@ void MapRegion::init_colours() m_colours[MF_MAP_WALL] = (map_colour)Options.tile_mapped_wall_col; m_colours[MF_DOOR] = (map_colour)Options.tile_door_col; m_colours[MF_ITEM] = (map_colour)Options.tile_item_col; - m_colours[MF_MONS_HOSTILE] = (map_colour)Options.tile_monster_col; m_colours[MF_MONS_FRIENDLY] = (map_colour)Options.tile_friendly_col; + m_colours[MF_MONS_PEACEFUL] = (map_colour)Options.tile_peaceful_col; m_colours[MF_MONS_NEUTRAL] = (map_colour)Options.tile_neutral_col; + m_colours[MF_MONS_HOSTILE] = (map_colour)Options.tile_monster_col; m_colours[MF_MONS_NO_EXP] = (map_colour)Options.tile_plant_col; m_colours[MF_STAIR_UP] = (map_colour)Options.tile_upstairs_col; m_colours[MF_STAIR_DOWN] = (map_colour)Options.tile_downstairs_col; diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index 002a19e86e..45bd2d161d 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -1348,6 +1348,8 @@ void TilesFramework::update_minimap(int gx, int gy, map_feature f) const monsters *mon = monster_at(gc); if (mon->friendly()) f = MF_MONS_FRIENDLY; + else if (mon->good_neutral()) + f = MF_MONS_PEACEFUL; else if (mon->neutral()) f = MF_MONS_NEUTRAL; else if (mons_class_flag(mon->type, M_NO_EXP_GAIN)) |