diff options
| author | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-14 23:15:56 +0000 |
|---|---|---|
| committer | j-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573> | 2009-09-14 23:15:56 +0000 |
| commit | 298c1e905c0c3d04acdb1dd0c5e6bedce77dec3c (patch) | |
| tree | 7a312ee2402250228b19e7afac77fb804c37b430 /crawl-ref/source/tilesdl.cc | |
| parent | 94530c7cbe5031fa9e512a0f9ae41dac41821559 (diff) | |
| download | crawl-ref-298c1e905c0c3d04acdb1dd0c5e6bedce77dec3c.tar.gz crawl-ref-298c1e905c0c3d04acdb1dd0c5e6bedce77dec3c.zip | |
Fix 2841668: Crawl segfaulting when attempting to use mpr() within the
DollEditRegion. Also, if the target file (dolls.txt) within settings/ is
writing protected create the file locally instead.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@10678 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/tilesdl.cc')
| -rw-r--r-- | crawl-ref/source/tilesdl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crawl-ref/source/tilesdl.cc b/crawl-ref/source/tilesdl.cc index 2c9f70df7d..95970da583 100644 --- a/crawl-ref/source/tilesdl.cc +++ b/crawl-ref/source/tilesdl.cc @@ -1332,10 +1332,10 @@ void TilesFramework::update_minimap(int gx, int gy, map_feature f) const int grid = mgrd[gx][gy]; if (mons_friendly_real(&menv[grid])) f = MF_MONS_FRIENDLY; - else if (mons_neutral(&menv[grid])) - f = MF_MONS_NEUTRAL; else if (mons_class_flag(menv[grid].type, M_NO_EXP_GAIN)) f = MF_MONS_NO_EXP; + else if (mons_neutral(&menv[grid])) + f = MF_MONS_NEUTRAL; } else if (f == MF_FLOOR || f == MF_MAP_FLOOR || f == MF_WATER) { |