fiddlerwoaroof/crawl - Change I4HQEB6RVIPJD3EQCNADMQJVGYAIIHTBGFVMPXHDNLYYG5JVIK4AC

Suppress unnecessary "Floor." lines when looking around and targeting.

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

Created by dshaligram on October 25, 2007

I4HQEB6RVIPJD3EQCNADMQJVGYAIIHTBGFVMPXHDNLYYG5JVIK4AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/direct.cc at line 1962 [6.3697945]

[4.27842]

[5.1203]

    bool monster_described = false;
    bool cloud_described = false;
    bool item_described = false;

Insertion in crawl-ref/source/direct.cc at line 1993 [6.3697945]
[6.3720569]
[6.3720569]
```
        {
```

Insertion in crawl-ref/source/direct.cc at line 1995 [6.3697945]

[6.3720600]

[6.3721534]

            item_described = true;
        }
        else
            monster_described = true;

Replacement in crawl-ref/source/direct.cc at line 2005 [6.3697945]

B:BD[7.15240] → [7.15240:15318]

B:BD[7.15318] → [8.11776:11841]

           std::string msg = "(Press <w>v<lightgray> for more information.)";
           print_formatted_paragraph(msg, get_number_of_cols());

[7.15240]

[7.15365]

            std::string msg = "(Press <w>v<lightgray> for more information.)";
            print_formatted_paragraph(msg, get_number_of_cols());

Replacement in crawl-ref/source/direct.cc at line 2019 [6.3697945]

B:BD[6.3723827] → [9.1603:1691]

        mprf(MSGCH_EXAMINE, "There is a cloud of %s here.", cloud_name(ctype).c_str());

[6.3723827]

[6.3725108]

        mprf(MSGCH_EXAMINE, "There is a cloud of %s here.",
             cloud_name(ctype).c_str());
        cloud_described = true;

Insertion in crawl-ref/source/direct.cc at line 2044 [6.3697945]
[6.3725895]
[6.3725895]
```
        item_described = true;
```

Replacement in crawl-ref/source/direct.cc at line 2075 [6.3697945]

B:BD[9.1767] → [2.1780:1826]

        if (interesting_feature(grd[mx][my]))

[9.1767]

[2.1826]

        const dungeon_feature_type feat = grd[mx][my];
        
        if (interesting_feature(feat))

Replacement in crawl-ref/source/direct.cc at line 2079 [6.3697945]

B:BD[2.1892] → [2.1892:1905]

[2.1892]

[9.1767]


        // Suppress "Floor." if there's something on that square that we've
        // already described.
        if ((feat == DNGN_FLOOR || feat == DNGN_FLOOR_SPECIAL)
            && (monster_described || item_described || cloud_described))
            return;

Replacement in crawl-ref/source/direct.cc at line 2087 [6.3697945]

B:BD[9.1817] → [10.1776:1814]

B:BD[10.1814] → [3.1600:1649]

∅:D[3.1649] → [10.1814:1910]

B:BD[10.1814] → [10.1814:1910]

        if (grd[mx][my] == DNGN_FLOOR
            || grd[mx][my] == DNGN_FLOOR_SPECIAL
            || grd[mx][my] == DNGN_SHALLOW_WATER
            || grd[mx][my] == DNGN_DEEP_WATER)

[9.1817]

[10.1910]

        if (feat == DNGN_FLOOR
            || feat == DNGN_FLOOR_SPECIAL
            || feat == DNGN_SHALLOW_WATER
            || feat == DNGN_DEEP_WATER)