fiddlerwoaroof/crawl - Change 2UUCC7V3WQ5KBHJS4MTKZ5OIELYJHSTUVRPYGPWIQ5JS6D7YIK4AC

Fix [1842182]: Casting either "Detect Traps" or "Detect Creatures" now

displays "You detect nothing." if nothing is found, just as casting "Detect Traps" does.

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

Created by dolorous on December 4, 2007

2UUCC7V3WQ5KBHJS4MTKZ5OIELYJHSTUVRPYGPWIQ5JS6D7YIK4AC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1278 [4.293070]

B:BD[3.717] → [3.717:786]

             (detect_traps(powc) > 0) ? "some traps!" : "nothing.");

[3.717]

[4.325013]

             (detect_traps(powc) > 0) ? "traps!" : "nothing.");

Replacement in crawl-ref/source/spl-cast.cc at line 1350 [4.293070]

B:BD[4.327461] → [4.327461:327489]

        detect_items(powc);

[4.327461]

[4.327489]

        mprf("You detect %s",
             (detect_items(powc) > 0) ? "items!" : "nothing.");

Replacement in crawl-ref/source/spl-cast.cc at line 1573 [4.293070]

B:BD[4.333769] → [4.333769:333801]

        detect_creatures(powc);

[4.333769]

[4.333801]

        mprf("You detect %s",
             (detect_creatures(powc) > 0) ? "creatures!" : "nothing.");

Deletion in crawl-ref/source/spells2.cc at line 107 [4.569242]
B:BD[4.571678] → [4.571678:571709]
```
    mpr("You detect items!");
```
Insertion in crawl-ref/source/spells2.cc at line 118 [4.569242]
[4.572025]
[2.12698]
```
                items_found++;
```

Replacement in crawl-ref/source/spells2.cc at line 147 [4.569242]

B:BD[4.572182] → [5.149520:149598]

static void mark_detected_creature(int gridx, int gridy, const monsters *mon,

[4.572182]

[5.149598]

static bool mark_detected_creature(int gridx, int gridy, const monsters *mon,

Insertion in crawl-ref/source/spells2.cc at line 150 [4.569242]
[5.149642]
[5.149642]
```
    bool found_good = false;
```
Deletion in crawl-ref/source/spells2.cc at line 157 [4.569242]
B:BD[5.149771] → [5.149771:149804]
```
        bool found_good = false;
```
Insertion in crawl-ref/source/spells2.cc at line 179 [4.569242]
[5.150342]
[5.150342]
```
    return found_good;
```
Deletion in crawl-ref/source/spells2.cc at line 198 [4.569242]
B:BD[4.572356] → [4.572356:572391]
```
    mpr("You detect creatures!");
```

Replacement in crawl-ref/source/spells2.cc at line 208 [4.569242]

B:BD[4.572769] → [5.150590:150667]

                mark_detected_creature(i, j, mon, fuzz_chance, fuzz_radius);

[4.572769]

[4.572834]

                if (mark_detected_creature(i, j, mon, fuzz_chance,
                                           fuzz_radius))
                {
                    creatures_found++;
                }

Fix [1842182]: Casting either "Detect Traps" or "Detect Creatures" now

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spl-cast.cc at line 1278 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1350 [4.293070]

Replacement in crawl-ref/source/spl-cast.cc at line 1573 [4.293070]

Deletion in crawl-ref/source/spells2.cc at line 107 [4.569242]

Insertion in crawl-ref/source/spells2.cc at line 118 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 147 [4.569242]

Insertion in crawl-ref/source/spells2.cc at line 150 [4.569242]

Deletion in crawl-ref/source/spells2.cc at line 157 [4.569242]

Insertion in crawl-ref/source/spells2.cc at line 179 [4.569242]

Deletion in crawl-ref/source/spells2.cc at line 198 [4.569242]

Replacement in crawl-ref/source/spells2.cc at line 208 [4.569242]