fiddlerwoaroof/crawl - Change UHL7ECQOTO3SHFAPV4T6ODJ2HLSMUKVHQJQF3CXM3IUNICR7LACAC

Handle it properly when Xom tries to make your weapon a hostile dancing

weapon and fails.

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

Created by dolorous on April 27, 2008

UHL7ECQOTO3SHFAPV4T6ODJ2HLSMUKVHQJQF3CXM3IUNICR7LACAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/xom.cc at line 840 [3.3]
[3.24951]
[3.25361]
```
            bool success = false;
```

Replacement in crawl-ref/source/xom.cc at line 843 [3.3]

B:BD[3.25395] → [3.25395:25461]

                dancing_weapon(100, true);      // nasty, but fun

[3.25395]

[3.25461]

                success = dancing_weapon(100, true); // nasty, but fun

Deletion in crawl-ref/source/xom.cc at line 848 [3.3]
B:BD[4.1274] → [2.134:172]
```
                bool success = false;
```
Insertion in crawl-ref/source/xom.cc at line 858 [3.3]
[3.25978]
[5.403]
```
            }
```

Replacement in crawl-ref/source/xom.cc at line 860 [3.3]

B:BD[5.404] → [2.484:608]

                if (success)
                {
                    god_speaks(GOD_XOM, _get_xom_speech("hostile monster"));

[5.404]

[2.608]

            if (success)
            {
                god_speaks(GOD_XOM, _get_xom_speech("hostile monster"));

Replacement in crawl-ref/source/xom.cc at line 864 [3.3]

B:BD[2.609] → [2.609:660]

                    done = true;
                }

[2.609]

[2.660]

                done = true;

Replacement in crawl-ref/source/spells3.h at line 85 [6.526814]
B:BD[6.529251] → [6.529251:529301]
```
void dancing_weapon(int pow, bool force_hostile);
```
[6.529251]
[6.529301]
```
bool dancing_weapon(int pow, bool force_hostile);
```
Replacement in crawl-ref/source/spells3.cc at line 474 [6.531613]
B:BD[6.543441] → [6.543441:543490]
```
void dancing_weapon(int pow, bool force_hostile)
```
[6.543441]
[6.543490]
```
bool dancing_weapon(int pow, bool force_hostile)
```
Replacement in crawl-ref/source/spells3.cc at line 524 [6.531613]
B:BD[7.930] → [7.930:946]
```
        return;
```
[7.930]
[6.544559]
```
        return false;
```
Insertion in crawl-ref/source/spells3.cc at line 547 [6.531613]
[8.172]
[6.545218]
```
    return true;
```