fiddlerwoaroof/crawl - Change TQLWCGVXVZ75H7MDBJD3DJDUFNW62WOAEDJUVKCHQTAXKBP47CSAC

Returning weapon beam path updates for trunk.

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

Created by dshaligram on October 9, 2007

TQLWCGVXVZ75H7MDBJD3DJDUFNW62WOAEDJUVKCHQTAXKBP47CSAC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/mstuff2.cc at line 1378 [4.1340842]

[3.642]

        // Fire beam in reverse
        pbolt.setup_retrace();
        viewwindow(true, false);
        fire_beam(pbolt, NULL);

Replacement in crawl-ref/source/mstuff2.cc at line 1384 [4.1340842]

B:BD[3.743] → [3.743:791]

                    << "'s hand!" << std::endl;

[3.743]

[3.791]

                    << "!" << std::endl;

Insertion in crawl-ref/source/item_use.cc at line 2258 [4.2781507]

[3.2467]

    {
        // Fire beam in reverse
        pbolt.setup_retrace();
        viewwindow(true, false);
        fire_beam(pbolt, NULL);

Insertion in crawl-ref/source/item_use.cc at line 2266 [4.2781507]
[3.2576]
[3.2576]
```
    }
```
Insertion in crawl-ref/source/beam.h at line 133 [4.4124541]
[5.106010]
[5.106010]
```
    coord_def   pos;                   // actual position
```

Insertion in crawl-ref/source/beam.h at line 148 [4.4124541]

[5.106921]


    bool        affects_nothing;       // should not hit monsters or features

Insertion in crawl-ref/source/beam.h at line 178 [4.4124541]
[5.108246]
[5.108246]
```
    void setup_retrace();
```

Replacement in crawl-ref/source/beam.cc at line 1268 [4.4128068]

B:BD[4.4169767] → [6.1227851:1227906]

    int tx = 0, ty = 0;     // test(new) x,y - integer

[4.4169767]

[4.4169919]

    int &tx(pbolt.pos.x), &ty(pbolt.pos.y);     // test(new) x,y - integer

Deletion in crawl-ref/source/beam.cc at line 1386 [4.4128068]
∅:D[6.1229903] → [4.4174932:4174933]
B:BD[4.4174932] → [4.4174932:4174933]

Replacement in crawl-ref/source/beam.cc at line 1418 [4.4128068]

B:BD[4.4176645] → [4.4176645:4176698]

            rangeRemaining -= affect(pbolt, tx, ty);

[4.4176645]

[4.4176698]

            if (!pbolt.affects_nothing)
                rangeRemaining -= affect(pbolt, tx, ty);

Replacement in crawl-ref/source/beam.cc at line 4766 [4.4128068]

B:BD[6.1254329] → [6.1254329:1254393]

               ench_power(0), hit(0), target_x(0), target_y(0),

[6.1254329]

[6.1254393]

               ench_power(0), hit(0), target_x(0), target_y(0), pos(),

Replacement in crawl-ref/source/beam.cc at line 4771 [4.4128068]

B:BD[6.1254691] → [7.1681:1824]

B:BD[7.1824] → [2.27251:27320]

∅:D[2.27320] → [7.1824:1901]

B:BD[7.1824] → [7.1824:1901]

∅:D[7.1901] → [6.1254889:1254953]

B:BD[6.1254889] → [6.1254889:1254953]

B:BD[6.1254953] → [8.696:770]

∅:D[8.770] → [9.4935:4967]

B:BD[9.4935] → [9.4935:4967]

∅:D[9.4967] → [6.1255024:1255028]

B:BD[6.1255024] → [6.1255024:1255028]

               aux_source(), obvious_effect(false), effect_known(true), 
               fr_count(0), foe_count(0), fr_power(0), foe_power(0), 
               fr_hurt(0), foe_hurt(0), fr_helped(0), foe_helped(0),
               is_tracer(false), aimed_at_feet(false), msg_generated(false),
               in_explosion_phase(false), smart_monster(false),
               can_see_invis(false), attitude(ATT_HOSTILE), foe_ratio(0),
               chose_ray(false)
{ }

[6.1254691]

[10.4567]

               aux_source(), affects_nothing(false), obvious_effect(false),
               effect_known(true), fr_count(0), foe_count(0), fr_power(0),
               foe_power(0), is_tracer(false), aimed_at_feet(false),
               msg_generated(false), in_explosion_phase(false),
               smart_monster(false), can_see_invis(false),
               attitude(ATT_HOSTILE), foe_ratio(0), chose_ray(false)
{
}

Insertion in crawl-ref/source/beam.cc at line 4814 [4.4128068]

[6.1255200]

[4.4260380]

}
void bolt::setup_retrace()
{
    if (pos.x && pos.y)
    {
        target_x = pos.x;
        target_y = pos.y;
    }
    std::swap(source_x, target_x);
    std::swap(source_y, target_y);
    affects_nothing = true;
    aimed_at_spot   = true;