diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-23 14:30:29 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2008-03-23 14:30:29 +0000 |
| commit | 0af59f5d233f429a70df12e87993f7bda7de30a7 (patch) | |
| tree | 37baf239dd33ab9ca033d170d60ef6665e08f612 /crawl-ref/source/tile1.cc | |
| parent | 7b2c4078bbab85c54058384d35c55f1bed19ab21 (diff) | |
| download | crawl-ref-0af59f5d233f429a70df12e87993f7bda7de30a7.tar.gz crawl-ref-0af59f5d233f429a70df12e87993f7bda7de30a7.zip | |
Introduce a temporary neutral brand for tiles because it was driving me nuts
when testing Ely's pacifying. (Currently only inappropriately reuses
TILE_NEW_STAIR, which will have to be replaced with something more distinctive
some time.)
Also add an option for colouring neutrals on the minimap (defaults to red,
like hostiles) and allow secondary item use by Ctrl-L-clicking on items in
inventory (firing weapons, unwielding rods, etc.)
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3830 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tile1.cc')
| -rw-r--r-- | crawl-ref/source/tile1.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/tile1.cc b/crawl-ref/source/tile1.cc index 99e1e6fd67..9284b1f0bf 100644 --- a/crawl-ref/source/tile1.cc +++ b/crawl-ref/source/tile1.cc @@ -816,6 +816,10 @@ int tileidx_monster(int mon_idx, bool detected) { ch |= TILE_FLAG_PET; } + else if (mons_neutral(mons)) + { + ch |= TILE_FLAG_NEUTRAL; + } else if (mons_looks_stabbable(mons)) { ch |= TILE_FLAG_STAB; @@ -824,7 +828,6 @@ int tileidx_monster(int mon_idx, bool detected) { ch |= TILE_FLAG_MAY_STAB; } - return ch; } |