fiddlerwoaroof/crawl - Change OV2LVRMR4XFWHWJETUDYSZKN36NV2RFXQ4ZUHVMQMV5WXZKSZQOAC

Add more miscellaneous minor fixes.

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

Created by dolorous on June 8, 2008

OV2LVRMR4XFWHWJETUDYSZKN36NV2RFXQ4ZUHVMQMV5WXZKSZQOAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells3.h at line 25 [3.526814]
B:BD[3.527303] → [3.527303:527355]
```
bool allow_control_teleport( bool silent = false );
```
[3.527303]
[3.527355]
```
bool allow_control_teleport(bool quiet = false);
```
Replacement in crawl-ref/source/spells3.cc at line 476 [3.531613]
∅:D[2.269] → [3.545601:545644]
B:BD[3.545601] → [3.545601:545644]
```
bool allow_control_teleport( bool silent )
```
[2.269]
[3.545644]
```
bool allow_control_teleport(bool quiet)
```

Replacement in crawl-ref/source/spells3.cc at line 478 [3.531613]

B:BD[3.545646] → [3.545646:545667]

    bool ret = true;

[3.545646]

[3.545667]

    bool retval = !(testbits(env.level_flags, LFLAG_NO_TELE_CONTROL)
                      || testbits(get_branch_flags(), BFLAG_NO_TELE_CONTROL));

Deletion in crawl-ref/source/spells3.cc at line 481 [3.531613]
B:BD[3.545668] → [4.2218:2339]
∅:D[4.2339] → [3.545774:545780]
B:BD[3.545774] → [3.545774:545780]
B:BD[3.545780] → [4.2340:2361]
∅:D[4.2361] → [3.547662:547669]
B:BD[3.547662] → [3.547662:547669]
```
    if (testbits(env.level_flags, LFLAG_NO_TELE_CONTROL)
        || testbits(get_branch_flags(), BFLAG_NO_TELE_CONTROL))
    {
        ret = false;
    }
```
Replacement in crawl-ref/source/spells3.cc at line 482 [3.531613]
B:BD[3.547727] → [5.147591:147645]
```
    if (!ret && player_control_teleport() && !silent)
```
[3.547727]
[3.547792]
```
    if (!quiet && !retval && player_control_teleport())
```
Replacement in crawl-ref/source/spells3.cc at line 485 [3.531613]
B:BD[3.547866] → [3.547866:547946]
```
    return ret;
}                               // end allow_control_teleport()
```
[3.547866]
[3.547946]
```
    return retval;
}
```
Insertion in crawl-ref/source/spells3.cc at line 509 [3.531613]
[3.548562]
[3.548562]
```
}
```
Deletion in crawl-ref/source/spells3.cc at line 511 [3.531613]
B:BD[3.548563] → [3.548563:548630]
```
    return;
}                               // end you_teleport()
```