fiddlerwoaroof/crawl - Change FRJZHFXLXDE7MANBAGFHRWIH77HC2I4JRGQ5TAVYZS676DU72QSAC

Make FPROP_FORCE_EXCLUDE set an actual travel exclusion.

FPROP_FORCE_EXCLUDE now sets an actual travel exclusion rather than bypassing the travel exclusion system. Exclusions are single squares.

Signed-off-by: Jude Brown <bookofjude@users.sourceforge.net> Signed-off-by: Robert Vollmert <rvollmert@gmx.net>

Created by Jude Brown on October 23, 2009

FRJZHFXLXDE7MANBAGFHRWIH77HC2I4JRGQ5TAVYZS676DU72QSAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.h at line 66 [5.29464]

B:BD[2.576] → [2.576:617]

                 bool autoexcl = false);

[2.576]

[6.494]

                 bool autoexcl = false, bool vaultexcl = false);

Replacement in crawl-ref/source/travel.h at line 355 [5.29464]

B:BD[7.1449] → [6.584:821]

B:BD[6.821] → [4.59:172]

    coord_def     pos;         // exclusion centre
    int           radius;      // exclusion radius
    bool          autoexclude; // Was set automatically.
    int           mon;         // Monster around which exclusion is centered.
    los_def       los;         // los from exclusion centre
    bool          uptodate;    // Is los up to date?

[7.1449]

[7.1490]

    coord_def     pos;          // exclusion centre
    int           radius;       // exclusion radius
    bool          autoexclude;  // Was set automatically.
    int           mon;          // Monster around which exclusion is centered.
    los_def       los;          // los from exclusion centre
    bool          uptodate;     // Is los up to date?
    bool          vaultexclude; // Is this exclusion set by a vault?

Replacement in crawl-ref/source/travel.h at line 368 [5.29464]

B:BD[6.995] → [6.995:1123]

                   bool autoexcl = false, int mons = NON_MONSTER)
        : pos(p), radius(r), autoexclude(autoexcl), mon(mons)

[6.995]

[7.1578]

                   bool autoexcl = false, int mons = NON_MONSTER,
                   bool vaultexcl = false)
        : pos(p), radius(r), autoexclude(autoexcl), mon(mons), vaultexclude(vaultexcl)

Deletion in crawl-ref/source/travel.cc at line 368 [5.39949]

B:BD[8.400] → [3.39:238]

    // We can force a travel exclusion by using the "force_exclude"
    // KPROP feature property in vaults. {due}
    if (testbits(env.map(p).property, FPROP_FORCE_EXCLUDE)) 
        return (true);

Replacement in crawl-ref/source/travel.cc at line 492 [5.39949]

∅:D[9.3142] → [6.1416:1480]

B:BD[7.3199] → [6.1416:1480]

void set_exclude(const coord_def &p, int radius, bool autoexcl)

[9.3142]

[7.3248]

void set_exclude(const coord_def &p, int radius, bool autoexcl, bool vaultexcl)

Replacement in crawl-ref/source/travel.cc at line 514 [5.39949]

B:BD[6.1640] → [6.1640:1719]

        curr_excludes.push_back(travel_exclude(p, radius, autoexcl, montype));

[6.1640]

[5.48159]

        curr_excludes.push_back(travel_exclude(p, radius, autoexcl, montype, vaultexcl));

Replacement in crawl-ref/source/mapdef.cc at line 471 [11.594797]

B:BD[10.3992] → [10.3992:4148]

            if (property >= FPROP_BLOODY)
                // Over-ride whatever property is already there.
               env.map(gc).property |= property;

[10.3992]

[12.87597]

            if (testbits(property, FPROP_FORCE_EXCLUDE))
                set_exclude(gc, 0, false, true);
            else if (property >= FPROP_BLOODY)
                 // Over-ride whatever property is already there.
                env.map(gc).property |= property;