fiddlerwoaroof/crawl - Change STOUXUZ734IUS6JFNR6KD3QYH43EFAOEWEIZ5GUR32A3Z6RFS6DQC

Use ETC_MAGIC for beam animations with unknown effect, so we don't

accidentally leak information about unID'd wands etc. Some additional space fixes.

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

Created by j-p-e-g on July 20, 2009

STOUXUZ734IUS6JFNR6KD3QYH43EFAOEWEIZ5GUR32A3Z6RFS6DQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/tilepick.cc at line 2693 [4.96318]
B:BD[4.158057] → [4.158057:158084]
```
    int col = bolt.colour;
```
[4.158057]
[4.158084]
```
    const int col = bolt.colour;
```

Replacement in crawl-ref/source/religion.cc at line 3482 [6.804403]

B:BD[5.6084] → [5.6084:6128]

∅:D[5.6128] → [7.2932:2980]

B:BD[7.2932] → [7.2932:2980]

        else if(_first_attack_conduct[midx]
           || _first_attack_was_friendly[midx])

[5.6084]

[7.2980]

        else if (_first_attack_conduct[midx]
                 || _first_attack_was_friendly[midx])

Replacement in crawl-ref/source/player.cc at line 7144 [6.962854]

∅:D[8.2574] → [9.6591:6632]

∅:D[10.8698] → [9.6591:6632]

B:BD[9.6591] → [9.6591:6632]

B:BD[9.6632] → [8.2575:2634]

    mprf( "You %s the ability to move!",
          paralysis ? "still haven't" : "suddenly lose" );

[10.8698]

[10.8699]

    mprf("You %s the ability to move!",
         paralysis ? "still haven't" : "suddenly lose");

Replacement in crawl-ref/source/player.cc at line 7160 [6.962854]

B:BD[11.4131] → [11.4131:4228]

    mprf( "You %s the ability to move!",
          petrif ? "still haven't" : "suddenly lose" );

[11.4131]

[11.4228]

    mprf("You %s the ability to move!",
         petrif ? "still haven't" : "suddenly lose");

Replacement in crawl-ref/source/ouch.cc at line 854 [6.1104358]
B:BD[12.17113] → [12.17113:17152]
```
        else if(dam >= you.hp_max / 2)
```
[12.17113]
[12.17152]
```
        else if (dam >= you.hp_max / 2)
```
Replacement in crawl-ref/source/ouch.cc at line 856 [6.1104358]
B:BD[12.17191] → [12.17191:17230]
```
        else if(dam >= you.hp_max / 4)
```
[12.17191]
[12.17230]
```
        else if (dam >= you.hp_max / 4)
```
Replacement in crawl-ref/source/itemprop.cc at line 2581 [14.646661]
B:BD[13.4250] → [13.4250:4288]
```
        else if(brand == SPMSL_STEEL)
```
[13.4250]
[13.4288]
```
        else if (brand == SPMSL_STEEL)
```
Replacement in crawl-ref/source/initfile.cc at line 1859 [6.2957258]
B:BD[15.10352] → [15.10352:10382]
```
        if(key_str[0] != '^')
```
[15.10352]
[15.10382]
```
        if (key_str[0] != '^')
```
Replacement in crawl-ref/source/initfile.cc at line 3181 [6.2957258]
B:BD[4.5854134] → [15.11303:11333]
```
    else if(key == "bindkey")
```
[4.5854002]
[15.11333]
```
    else if (key == "bindkey")
```

Replacement in crawl-ref/source/beam.cc at line 135 [6.4128068]

B:BD[16.2842] → [16.2842:2906]

void zap_animation(int colour, const monsters *mon, bool force)

[16.2842]

[14.1220823]

static void _zap_animation(int colour, const monsters *mon = NULL,
                           bool force = false)

Replacement in crawl-ref/source/beam.cc at line 142 [6.4128068]
B:BD[14.1221000] → [14.1221000:1221054]
```
        if (!force && !player_monster_visible( mon ))
```
[14.1221000]
[14.1221054]
```
        if (!force && !player_monster_visible(mon))
```
Deletion in crawl-ref/source/beam.cc at line 162 [6.4128068]
B:BD[4.5936912] → [3.14840:14841]
Replacement in crawl-ref/source/beam.cc at line 173 [6.4128068]
∅:D[17.8713] → [18.12983:13059]
B:BD[14.1221559] → [18.12983:13059]
```
static void _ench_animation( int flavour, const monsters *mon, bool force )
```
[17.8713]
[14.1221634]
```
static void _ench_animation(int flavour, const monsters *mon, bool force)
```

Replacement in crawl-ref/source/beam.cc at line 186 [6.4128068]

B:BD[19.5818] → [2.2899:2952]

    zap_animation(element_colour(elem), mon, force);

[19.5818]

[20.17428]

    _zap_animation(element_colour(elem), mon, force);

Replacement in crawl-ref/source/beam.cc at line 1606 [6.4128068]

B:BD[21.12483] → [21.12483:12524]

        tile_beam = tileidx_bolt(*this);

[21.12483]

[4.5937008]

    {
        if (effect_known)
            tile_beam = tileidx_bolt(*this);
        else
            tile_beam = tileidx_zap(ETC_MAGIC);
    }

Replacement in crawl-ref/source/beam.cc at line 3584 [6.4128068]

B:BD[21.37715] → [21.37715:37752]

    _ench_animation( real_flavour );

[21.37715]

[21.37752]

    if (effect_known)
        _ench_animation(real_flavour);
    else
        _zap_animation(-1);

Replacement in crawl-ref/source/beam.cc at line 4284 [6.4128068]

B:BD[21.50849] → [21.50849:50891]

    _ench_animation( real_flavour, mon );

[21.50849]

[6.4236451]

    if (effect_known)
        _ench_animation( real_flavour, mon );
    else
        _zap_animation(-1, mon, false);

Use ETC_MAGIC for beam animations with unknown effect, so we don't

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/tilepick.cc at line 2693 [4.96318]

Replacement in crawl-ref/source/religion.cc at line 3482 [6.804403]

Replacement in crawl-ref/source/player.cc at line 7144 [6.962854]

Replacement in crawl-ref/source/player.cc at line 7160 [6.962854]

Replacement in crawl-ref/source/ouch.cc at line 854 [6.1104358]

Replacement in crawl-ref/source/ouch.cc at line 856 [6.1104358]

Replacement in crawl-ref/source/itemprop.cc at line 2581 [14.646661]

Replacement in crawl-ref/source/initfile.cc at line 1859 [6.2957258]

Replacement in crawl-ref/source/initfile.cc at line 3181 [6.2957258]

Replacement in crawl-ref/source/beam.cc at line 135 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 142 [6.4128068]

Deletion in crawl-ref/source/beam.cc at line 162 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 173 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 186 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 1606 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 3584 [6.4128068]

Replacement in crawl-ref/source/beam.cc at line 4284 [6.4128068]