fiddlerwoaroof/crawl - Change WBRAEO5JU2JNLWCSBCHQGVSB64FJBCXLT5HCRRDM2ZBSZSOZNEIQC

When setting a random wandering target, make sure it's in bounds by using

X_BOUND_2 and Y_BOUND_2 rather than GXM and GYM.

Assert that _handle_behaviour() has set a valid target.

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

Created by zelgadis on January 3, 2009

WBRAEO5JU2JNLWCSBCHQGVSB64FJBCXLT5HCRRDM2ZBSZSOZNEIQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/monstuff.cc at line 2379 [5.1396662]

B:BD[3.2770] → [3.2770:2828]

    ASSERT(in_bounds(src_pos) || src_pos == coord_def());

[3.2770]

[3.2828]

    ASSERT(in_bounds(src_pos) || src_pos.origin());

Insertion in crawl-ref/source/monstuff.cc at line 2559 [5.1396662]
[6.2937]
[7.2747]
```
    ASSERT(in_bounds(mon->target) || mon->target.origin());
```

Replacement in crawl-ref/source/monstuff.cc at line 3531 [5.1396662]

B:BD[4.3885] → [4.3885:3990]

            mon->target.set(10 + random2(GXM - 10),
                            10 + random2(GYM - 10));

[4.3885]

[4.3990]

            mon->target.set(10 + random2(X_BOUND_2 - 10),
                            10 + random2(Y_BOUND_2 - 10));

Replacement in crawl-ref/source/monstuff.cc at line 3652 [5.1396662]

B:BD[5.1440651] → [8.44266:44341]

        mon->target.set( 10 + random2(GXM - 10), 10 + random2(GYM - 10) );

[5.1440651]

[9.5246]

        mon->target.set( 10 + random2(X_BOUND_2 - 10),
                         10 + random2(Y_BOUND_2 - 10) );

Replacement in crawl-ref/source/monstuff.cc at line 3950 [5.1396662]

B:BD[5.1447406] → [8.45193:45314]

                    mon->target.set(10 + random2(GXM - 10),
                                    10 + random2(GYM - 10));

[5.1447406]

[5.1447526]

                    mon->target.set(10 + random2(X_BOUND_2 - 10),
                                    10 + random2(Y_BOUND_2 - 10));

Replacement in crawl-ref/source/monstuff.cc at line 4005 [5.1396662]

B:BD[10.2831] → [8.45472:45601]

                        mon->target.set(10 + random2(GXM - 10),
                                        10 + random2(GYM - 10));

[10.2831]

[11.5481]

                        mon->target.set(10 + random2(X_BOUND_2 - 10),
                                        10 + random2(Y_BOUND_2 - 10));

Insertion in crawl-ref/source/monstuff.cc at line 6761 [5.1396662]
[9.5603]
[12.2542]
```
        ASSERT(in_bounds(monster->target) || monster->target.origin());
```

Replacement in crawl-ref/source/monstuff.cc at line 7015 [5.1396662]

B:BD[13.7151] → [8.51061:51198]

                        monster->target.set(10 + random2(GXM - 10),
                                            10 + random2(GYM - 10));

[13.7151]

[13.7287]

                        monster->target.set(10 + random2(X_BOUND_2 - 10),
                                            10 + random2(Y_BOUND_2 - 10));

Replacement in crawl-ref/source/monstuff.cc at line 7042 [5.1396662]

B:BD[13.7979] → [8.51199:51336]

                        monster->target.set(10 + random2(GXM - 10),
                                            10 + random2(GYM - 10));

[13.7979]

[13.8115]

                        monster->target.set(10 + random2(X_BOUND_2 - 10),
                                            10 + random2(Y_BOUND_2 - 10));

Replacement in crawl-ref/source/monstuff.cc at line 7067 [5.1396662]

B:BD[14.9514] → [15.10524:10577]

∅:D[15.10577] → [16.437761:437818]

B:BD[16.437761] → [16.437761:437818]

B:BD[16.437818] → [2.2569:2624]

∅:D[2.2624] → [16.437872:437902]

B:BD[16.437872] → [16.437872:437902]

B:BD[16.437902] → [17.2955:2988]

        // Reevaluate behaviour, since the monster's
        // surroundings have changed (it may have moved,
        // or died for that matter).  Don't bother for
        // dead monsters.  :)
        if (monster->type != -1)

[14.9514]

[18.8442]

        // Reevaluate behaviour, since the monster's surroundings have
        // changed (it may have moved, or died for that matter).  Don't
        // bother for dead monsters.  :)
        if (monster->alive())
        {

Insertion in crawl-ref/source/monstuff.cc at line 7073 [5.1396662]

[18.8482]

[5.1517392]

            ASSERT(in_bounds(monster->target) || monster->target.origin());
        }