fiddlerwoaroof/crawl - Change NEF6I3KWPTUKZM32MZ3XWTMLK7TBNLJQ7WEIXCPWZ5GRK6TVIEUAC

Move exclusion marshalling code to exclude.cc.

Created by Robert Vollmert on October 26, 2009

NEF6I3KWPTUKZM32MZ3XWTMLK7TBNLJQ7WEIXCPWZ5GRK6TVIEUAC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/travel.cc at line 3317 [3.39949]

B:BD[3.123297] → [4.2351:2393]

∅:D[4.2393] → [3.123336:123442]

B:BD[3.123336] → [3.123336:123442]

B:BD[3.123442] → [4.2394:2497]

B:BD[4.2497] → [5.484:539]

∅:D[5.539] → [6.3564:3614]

B:BD[6.3564] → [6.3564:3614]

∅:D[4.2497] → [3.123532:123548]

∅:D[6.3614] → [3.123532:123548]

∅:D[7.4813] → [3.123532:123548]

B:BD[3.123532] → [3.123532:123548]

    marshallShort(outf, excludes.size());
    if (excludes.size())
    {
        for (int i = 0, count = excludes.size(); i < count; ++i)
        {
            marshallCoord(outf, excludes[i].pos);
            marshallShort(outf, excludes[i].radius);
            marshallBoolean(outf, excludes[i].autoex);
            marshallShort(outf, excludes[i].mon);
        }
    }

[3.123297]

[3.123548]

    marshallExcludes(outf, excludes);

Replacement in crawl-ref/source/travel.cc at line 3347 [3.39949]

B:BD[3.124318] → [3.124318:124340]

B:BD[3.124340] → [4.2665:2707]

∅:D[4.2707] → [3.124377:124481]

B:BD[3.124377] → [3.124377:124481]

B:BD[3.124481] → [4.2708:2798]

B:BD[4.2798] → [6.3669:3707]

B:BD[6.3707] → [8.372:420]

∅:D[8.420] → [6.3751:3867]

∅:D[9.493] → [6.3751:3867]

B:BD[6.3751] → [6.3751:3867]

B:BD[6.3867] → [10.295:371]

∅:D[10.371] → [6.3916:4004]

B:BD[6.3916] → [6.3916:4004]

∅:D[6.4004] → [3.124586:124602]

∅:D[7.4953] → [3.124586:124602]

B:BD[3.124586] → [3.124586:124602]

    excludes.clear();
    int nexcludes = unmarshallShort(inf);
    if (nexcludes)
    {
        for (int i = 0; i < nexcludes; ++i)
        {
            coord_def c;
            unmarshallCoord(inf, c);
            const int radius = unmarshallShort(inf);
            bool autoexcl    = false;
            monster_type mon = MONS_NO_MONSTER;
            if (minorVersion >= TAG_ANNOTATE_EXCL)
            {
                autoexcl = unmarshallBoolean(inf);
                mon      = static_cast<monster_type>(unmarshallShort(inf));
            }
            excludes.push_back(travel_exclude(c, radius, autoexcl, mon));
        }
    }

[3.124318]

[3.124602]

    unmarshallExcludes(inf, minorVersion, excludes);

Insertion in crawl-ref/source/exclude.h at line 47 [11.2964]

[2.4532]

[11.3181]

class writer;
class reader;
void marshallExcludes(writer& outf, const exclvec& excludes);
void unmarshallExcludes(reader& inf, char minorVersion, exclvec& excludes);

Insertion in crawl-ref/source/exclude.cc at line 13 [11.3225]
[11.3392]
[2.4556]
```
#include "tags.h"
```

Insertion in crawl-ref/source/exclude.cc at line 365 [11.3225]

[2.12001]

}
void marshallExcludes(writer& outf, const exclvec& excludes)
{
    marshallShort(outf, excludes.size());
    if (excludes.size())
    {
        for (int i = 0, count = excludes.size(); i < count; ++i)
        {
            marshallCoord(outf, excludes[i].pos);
            marshallShort(outf, excludes[i].radius);
            marshallBoolean(outf, excludes[i].autoex);
            marshallShort(outf, excludes[i].mon);
            // XXX: marshall travel_exclude::vault?
        }
    }

Insertion in crawl-ref/source/exclude.cc at line 384 [11.3225]

[2.12004]

void unmarshallExcludes(reader& inf, char minorVersion, exclvec &excludes)
{ 
    excludes.clear();
    int nexcludes = unmarshallShort(inf);
    if (nexcludes)
    {
        for (int i = 0; i < nexcludes; ++i)
        {
            coord_def c;
            unmarshallCoord(inf, c);
            const int radius = unmarshallShort(inf);
            bool autoexcl    = false;
            monster_type mon = MONS_NO_MONSTER;
            if (minorVersion >= TAG_ANNOTATE_EXCL)
            {
                autoexcl = unmarshallBoolean(inf);
                mon      = static_cast<monster_type>(unmarshallShort(inf));
            }
            excludes.push_back(travel_exclude(c, radius, autoexcl, mon));
        }
    }
}