fiddlerwoaroof/crawl - Change ACSERNMWRXP4VUEUVKDBSDGTBZRI34P2PUVUDTKSAHNTCEDDCCVAC

Factored out bolt tracer variables into tracer_info struct.

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

Created by haranp on January 2, 2009

ACSERNMWRXP4VUEUVKDBSDGTBZRI34P2PUVUDTKSAHNTCEDDCCVAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1349 [6.436250]
B:BD[5.1501] → [5.1501:1521]
```
    // Fire tracer.
```
[5.1501]
[7.21899]
```
    // Fire tracer. FIXME: use player_tracer() here!
```
Deletion in crawl-ref/source/spells4.cc at line 1354 [6.436250]
B:BD[8.473] → [8.473:502]
```
    beem.fr_count       = 0;
```
Insertion in crawl-ref/source/spells4.cc at line 1356 [6.436250]
[8.567]
[9.954]
```
    beem.friend_info.reset();
```

Replacement in crawl-ref/source/spells1.cc at line 583 [6.616635]

B:BD[10.352] → [7.35358:35398]

∅:D[7.35398] → [10.432:591]

B:BD[10.432] → [10.432:591]

∅:D[9.1141] → [10.591:626]

B:BD[10.591] → [10.591:626]

        beem.source        = you.pos();
        beem.can_see_invis = player_see_invis();
        beem.smart_monster = true;
        beem.attitude      = ATT_FRIENDLY;
        beem.fr_count      = 0;
        beem.is_tracer     = true;

[10.352]

[11.934]

        beem.source            = you.pos();
        beem.can_see_invis     = player_see_invis();
        beem.smart_monster     = true;
        beem.attitude          = ATT_FRIENDLY;
        beem.friend_info.count = 0;
        beem.is_tracer         = true;

Replacement in crawl-ref/source/mon-util.cc at line 2632 [6.1699344]

B:BD[2.2503] → [2.2503:2574]

         beam.foe_count, beam.foe_power, beam.fr_count, beam.fr_power,

[2.2503]

[2.2574]

         beam.foe_info.count, beam.foe_info.power,
         beam.friend_info.count, beam.friend_info.power,

Replacement in crawl-ref/source/mon-util.cc at line 2643 [6.1699344]
∅:D[12.10848] → [6.1735258:1735287]
B:BD[6.1735258] → [6.1735258:1735287]
```
    if (beam.foe_count == 0)
```
[12.10848]
[13.2651]
```
    if (beam.foe_info.count == 0)
```
Replacement in crawl-ref/source/mon-util.cc at line 2650 [6.1699344]
B:BD[2.2676] → [2.2676:2704]
```
    if (beam.fr_count == 0)
```
[2.2676]
[6.1735426]
```
    if (beam.friend_info.count == 0)
```

Replacement in crawl-ref/source/mon-util.cc at line 2654 [6.1699344]

∅:D[14.8256] → [15.2905:3011]

B:BD[6.1735511] → [15.2905:3011]

    return (beam.foe_power >=
            div_round_up(beam.foe_ratio * (beam.foe_power + beam.fr_power),

[14.8256]

[15.3011]

    return (beam.foe_info.power >=
            div_round_up(beam.foe_ratio *
                         (beam.foe_info.power + beam.friend_info.power),

Replacement in crawl-ref/source/item_use.cc at line 1870 [6.2781507]

B:BD[16.5117] → [16.5117:5352]

        pbolt.foe_count     = pbolt.fr_count = 0;
        pbolt.foe_power     = pbolt.fr_power = 0;
        pbolt.fr_helped     = pbolt.fr_hurt  = 0;
        pbolt.foe_helped    = pbolt.foe_hurt = 0;
        pbolt.foe_ratio     = 100;

[16.5117]

[17.5158]

        pbolt.foe_info.reset();
        pbolt.friend_info.reset();
        pbolt.foe_ratio = 100;

Replacement in crawl-ref/source/item_use.cc at line 3563 [6.2781507]

B:BD[18.2929] → [18.2929:2998]

B:BD[18.2998] → [4.2777:2848]

    const bool risky = dangerous && (beam.fr_count || beam.foe_count
                                     || invis_enemy || aimed_at_self);

[18.2929]

[18.3074]

    const bool risky = dangerous && (beam.friend_info.count
                                     || beam.foe_info.count
                                     || invis_enemy
                                     || aimed_at_self);

Insertion in crawl-ref/source/beam.h at line 38 [6.4124541]

[11.5106]


struct tracer_info
{
    int count;                         // # of times something "hit"
    int power;                         // total levels/hit dice affected
    int hurt;                          // # of things actually hurt
    int helped;                        // # of things actually helped
    bool dont_stop;                    // Player said not to stop on this

Insertion in crawl-ref/source/beam.h at line 47 [6.4124541]
[11.5107]
[19.105574]
```
    tracer_info();
    void reset();
};
```

Deletion in crawl-ref/source/beam.h at line 87 [6.4124541]

B:BD[19.107035] → [20.5739:5740]

∅:D[20.5740] → [19.107110:107258]

B:BD[19.107110] → [19.107110:107258]

B:BD[19.107258] → [21.24078:24228]


    int         fr_count, foe_count;   // # of times a friend/foe is "hit"
    int         fr_power, foe_power;   // total levels/hit dice affected
    int         fr_hurt, foe_hurt;     // # of friends/foes actually hurt
    int         fr_helped, foe_helped; // # of friends/foes actually helped

Replacement in crawl-ref/source/beam.h at line 97 [6.4124541]

B:BD[19.107513] → [19.107513:107597]

    bool        in_explosion_phase;   // explosion phase (as opposed to beam phase)

[19.107513]

[19.107597]

    bool     in_explosion_phase; // explosion phase (as opposed to beam phase)

Insertion in crawl-ref/source/beam.h at line 102 [6.4124541]
[19.107893]
[19.107893]
```
    tracer_info foe_info;
    tracer_info friend_info;
```

Deletion in crawl-ref/source/beam.h at line 108 [6.4124541]

∅:D[22.2898] → [23.2841:3040]

B:BD[23.2841] → [23.2841:3040]

    bool        dont_stop_foe;   // stop_attack_prompt() returned false for foe
    bool        dont_stop_fr;    // stop_attack_prompt() returned false for
                                 // friend

Replacement in crawl-ref/source/beam.h at line 117 [6.4124541]

B:BD[20.6308] → [11.5325:5392]

    bool        use_target_as_pos; // pos() should return ::target

[20.6308]

[11.5392]

    bool        use_target_as_pos; // pos() should return ::target()

Insertion in crawl-ref/source/beam.cc at line 73 [6.4128068]

[24.324]


tracer_info::tracer_info()
{
    reset();
}
void tracer_info::reset()
{
    count = power = hurt = helped = 0;
    dont_stop = false;
}

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

B:BD[25.8651] → [8.4295:4629]

    pbolt.foe_count      = pbolt.fr_count = 0;
    pbolt.foe_power      = pbolt.fr_power = 0;
    pbolt.fr_helped      = pbolt.fr_hurt  = 0;
    pbolt.foe_helped     = pbolt.foe_hurt = 0;
    pbolt.foe_ratio      = 100;
    pbolt.beam_cancelled = false;
    pbolt.dont_stop_foe  = pbolt.dont_stop_fr = pbolt.dont_stop_player = false;

[25.8651]

[26.30110]

    pbolt.friend_info.reset();
    pbolt.foe_info.reset();
    pbolt.foe_ratio        = 100;
    pbolt.beam_cancelled   = false;
    pbolt.dont_stop_player = false;

Replacement in crawl-ref/source/beam.cc at line 2014 [6.4128068]
B:BD[21.24376] → [11.22490:22532]
```
        if (foe_hurt == 0 && fr_hurt > 0)
```
[21.24376]
[21.24430]
```
        if (foe_info.hurt == 0 && friend_info.hurt > 0)
```

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

B:BD[21.24466] → [11.22533:22584]

        else if (foe_helped > 0 && fr_helped == 0)

[21.24466]

[21.24529]

        else if (foe_info.helped > 0 && friend_info.helped == 0)

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

B:BD[11.22635] → [11.22635:22686]

        if (foe_hurt > 0 && !mons_wont_attack(mon)

[11.22635]

[27.7310]

        if (foe_info.hurt > 0 && !mons_wont_attack(mon)

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

B:BD[5.9671] → [5.9671:9975]

//  The output from this tracer function is four variables in the beam struct:
//  fr_count, foe_count: a count of how many friends and foes will (probably)
//  be hit by this beam
//  fr_power, foe_power: a measure of how many 'friendly' hit dice it will
//  affect, and how many 'unfriendly' hit dice.

[5.9671]

[5.9975]

//  The output from this tracer function is written into the
//  tracer_info variables (friend_info and foe_info.)

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

∅:D[28.4051] → [29.34943:35127]

B:BD[6.4200448] → [29.34943:35127]

    pbolt.foe_count     = pbolt.fr_count = 0;
    pbolt.foe_power     = pbolt.fr_power = 0;
    pbolt.fr_helped     = pbolt.fr_hurt  = 0;
    pbolt.foe_helped    = pbolt.foe_hurt = 0;

[28.4051]

[20.9811]

    pbolt.foe_info.reset();
    pbolt.friend_info.reset();

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

B:BD[6.4223288] → [11.33476:33554]

                fr_count++;
                fr_power += you.experience_level;

[6.4223288]

[11.33554]

                friend_info.count++;
                friend_info.power += you.experience_level;

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

B:BD[11.33804] → [11.33804:33874]

            fr_count++;
            fr_power += you.experience_level;

[11.33804]

[11.33874]

            friend_info.count++;
            friend_info.power += you.experience_level;

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

B:BD[11.33907] → [11.33907:33979]

            foe_count++;
            foe_power += you.experience_level;

[11.33907]

[11.33979]

            foe_info.count++;
            foe_info.power += you.experience_level;

Replacement in crawl-ref/source/beam.cc at line 3702 [6.4128068]
B:BD[21.25302] → [11.42486:42509]
```
            fr_hurt++;
```
[21.25302]
[11.42509]
```
            friend_info.hurt++;
```
Replacement in crawl-ref/source/beam.cc at line 3716 [6.4128068]
B:BD[11.42760] → [11.42760:42784]
```
            foe_hurt++;
```
[11.42760]
[11.42784]
```
            foe_info.hurt++;
```
Replacement in crawl-ref/source/beam.cc at line 3722 [6.4128068]
B:BD[11.42855] → [11.42855:42880]
```
            fr_helped++;
```
[11.42855]
[11.42880]
```
            friend_info.helped++;
```
Replacement in crawl-ref/source/beam.cc at line 3725 [6.4128068]
B:BD[11.42903] → [11.42903:42929]
```
            foe_helped++;
```
[11.42903]
[11.42929]
```
            foe_info.helped++;
```
Replacement in crawl-ref/source/beam.cc at line 3910 [6.4128068]
B:BD[21.26204] → [11.44751:44774]
```
            fr_hurt++;
```
[21.26204]
[6.4233382]
```
            friend_info.hurt++;
```
Replacement in crawl-ref/source/beam.cc at line 3924 [6.4128068]
B:BD[21.26423] → [11.44857:44881]
```
            foe_hurt++;
```
[21.26423]
[21.26452]
```
            foe_info.hurt++;
```
Replacement in crawl-ref/source/beam.cc at line 3965 [6.4128068]
B:BD[11.45267] → [11.45267:45291]
```
            foe_hurt++;
```
[11.45267]
[11.45291]
```
            foe_info.hurt++;
```
Replacement in crawl-ref/source/beam.cc at line 3967 [6.4128068]
B:BD[11.45322] → [11.45322:45348]
```
            foe_helped++;
```
[11.45322]
[21.26708]
```
            foe_info.helped++;
```
Replacement in crawl-ref/source/beam.cc at line 3973 [6.4128068]
B:BD[30.829] → [11.45377:45400]
```
            fr_hurt++;
```
[30.829]
[30.830]
```
            friend_info.hurt++;
```
Replacement in crawl-ref/source/beam.cc at line 3983 [6.4128068]
B:BD[11.45561] → [11.45561:45586]
```
            fr_helped++;
```
[11.45561]
[17.10112]
```
            friend_info.helped++;
```

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

B:BD[31.1246988] → [11.47351:47447]

        if ((fr_count == 1 && !dont_stop_fr)
            || (foe_count == 1 && !dont_stop_foe))

[31.1246988]

[31.1247033]

        if ((friend_info.count == 1 && !friend_info.dont_stop)
            || (foe_info.count == 1 && !foe_info.dont_stop))

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

B:BD[29.37956] → [11.47675:47834]

                if (fr_count == 1)
                    dont_stop_fr = true;
                else if (foe_count == 1)
                    dont_stop_foe = true;

[29.37956]

[29.37957]

                if (friend_info.count == 1)
                    friend_info.dont_stop = true;
                else if (foe_info.count == 1)
                    foe_info.dont_stop = true;

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

B:BD[11.48440] → [11.48440:48533]

        // 1/3 damage, then power of 5 would be applied to
        // foe_power or fr_power.

[11.48440]

[6.4234727]

        // 1/3 damage, then power of 5 would be applied.

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

B:BD[11.48660] → [11.48660:48728]

            foe_power += 2 * final * mons_power(mon->type) / preac;

[11.48660]

[11.48728]

            foe_info.power += 2 * final * mons_power(mon->type) / preac;

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

B:BD[11.48741] → [11.48741:48808]

            fr_power += 2 * final * mons_power(mon->type) / preac;

[11.48741]

[11.48808]

            friend_info.power += 2 * final * mons_power(mon->type) / preac;

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

B:BD[11.49335] → [11.49335:49400]

        foe_count++;
        foe_power += mons_power(mon->type);

[11.49335]

[11.49400]

        foe_info.count++;
        foe_info.power += mons_power(mon->type);

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

B:BD[11.49421] → [11.49421:49484]

        fr_count++;
        fr_power += mons_power(mon->type);

[11.49421]

[11.49484]

        friend_info.count++;
        friend_info.power += mons_power(mon->type);

Deletion in crawl-ref/source/beam.cc at line 5404 [6.4128068]
∅:D[3.3328] → [32.20047:20184]
∅:D[33.20078] → [32.20047:20184]
∅:D[11.73201] → [32.20047:20184]
B:BD[32.20047] → [32.20047:20184]
```
               fr_count(0), foe_count(0), fr_power(0), foe_power(0),
               fr_hurt(0), foe_hurt(0), fr_helped(0),foe_helped(0),
```

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

B:BD[34.7573] → [34.7573:7651]

∅:D[34.7651] → [20.15518:15579]

B:BD[35.4925] → [20.15518:15579]

               chose_ray(false), beam_cancelled(false), dont_stop_foe(false),
               dont_stop_fr(false), dont_stop_player(false),

[34.7573]

[11.73202]

               chose_ray(false), beam_cancelled(false), dont_stop_player(false),

Factored out bolt tracer variables into tracer_info struct.

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/spells4.cc at line 1349 [6.436250]

Deletion in crawl-ref/source/spells4.cc at line 1354 [6.436250]

Insertion in crawl-ref/source/spells4.cc at line 1356 [6.436250]

Replacement in crawl-ref/source/spells1.cc at line 583 [6.616635]

Replacement in crawl-ref/source/mon-util.cc at line 2632 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2643 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2650 [6.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 2654 [6.1699344]

Replacement in crawl-ref/source/item_use.cc at line 1870 [6.2781507]

Replacement in crawl-ref/source/item_use.cc at line 3563 [6.2781507]

Insertion in crawl-ref/source/beam.h at line 38 [6.4124541]

Insertion in crawl-ref/source/beam.h at line 47 [6.4124541]

Deletion in crawl-ref/source/beam.h at line 87 [6.4124541]

Replacement in crawl-ref/source/beam.h at line 97 [6.4124541]

Insertion in crawl-ref/source/beam.h at line 102 [6.4124541]

Deletion in crawl-ref/source/beam.h at line 108 [6.4124541]

Replacement in crawl-ref/source/beam.h at line 117 [6.4124541]

Insertion in crawl-ref/source/beam.cc at line 73 [6.4128068]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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