fiddlerwoaroof/crawl - Change 7PDOCETBGLAAMJUEDC25WKQR4IX75KT3BON4AXL5IE3BR3BO4L5AC

Fix bug 2354889: if shallow water has its colour overriden, then make

items laying in it the same colour.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7669 c06c8d41-db1a-0410-9941-cceddc491573

Created by zelgadis on November 28, 2008

7PDOCETBGLAAMJUEDC25WKQR4IX75KT3BON4AXL5IE3BR3BO4L5AC

Dependencies

[2] CFWPAA7X7JQBNHFFEY7FJUZZ56YIQXGXEQ7EEVZMJ65YCPNO2L5AC
[3] WT66JDIRTLLP37SHTV4GI3V64JFJ4D25LNRLGCHFG6CLEFKJ3QGQC
[4] K2CS6TCX2NDVL2ASEHGP4J4K4IJ6FP3ANNKTSIWVG43HPYSBX6ZQC

In channels

main

Change contents

Replacement in crawl-ref/source/view.cc at line 1432 [4.16817]

B:BD[3.1623] → [2.395:462]

        ecol = (grid == DNGN_SHALLOW_WATER) ? CYAN : eitem.colour;

[3.1623]

[3.1689]

        const unsigned short gcol = env.grid_colours(gp);
        ecol = (grid == DNGN_SHALLOW_WATER) ?
               (gcol != BLACK ? gcol : CYAN) : eitem.colour;