fiddlerwoaroof/crawl - Change V4WGXVERZ34B7CEINV4D3ZYEKKT2TUIUYTOX5FSOX6B26U3DPVLQC

Fixed feature and cset options being ignored.

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

Created by dshaligram on November 28, 2006

V4WGXVERZ34B7CEINV4D3ZYEKKT2TUIUYTOX5FSOX6B26U3DPVLQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/view.h at line 145 [4.13254]
[3.1287]
[3.1287]
```
dungeon_char_type dchar_by_name(const std::string &name);
```

Deletion in crawl-ref/source/view.cc at line 70 [4.16817]

∅:D[2.246] → [3.1928:2575]

B:BD[3.1928] → [3.1928:2575]


struct feature_def
{
    unsigned short      symbol;          // symbol used for seen terrain
    unsigned short      magic_symbol;    // symbol used for magic-mapped terrain
    unsigned short      colour;          // normal in LoS colour
    unsigned short      map_colour;      // colour when out of LoS on display
    unsigned short      seen_colour;     // map_colour when is_terrain_seen()
    bool                notable;         // gets noted when seen
    bool                seen_effect;     // requires special handling when seen
};
struct feature_override
{
    dungeon_feature_type    feat;
    feature_def             override;
};

Replacement in crawl-ref/source/view.cc at line 71 [4.16817]

B:BD[3.2576] → [3.2576:2697]

static FixedVector< struct feature_def, NUM_FEATURES >  Feature;
static std::vector<feature_override> Feature_Overrides;

[3.2576]

[3.2697]

static FixedVector<feature_def, NUM_FEATURES> Feature;

Deletion in crawl-ref/source/view.cc at line 2585 [4.16817]
∅:D[3.40967] → [4.89716:89717]
B:BD[4.89716] → [4.89716:89717]
B:BD[4.89717] → [3.40968:41031]
```
static unsigned char cset_override[NUM_CSET][NUM_DCHAR_TYPES];
```

Deletion in crawl-ref/source/view.cc at line 2604 [4.16817]

B:BD[3.41804] → [3.41804:43051]

∅:D[3.43051] → [4.89957:89970]

B:BD[4.89957] → [4.89957:89970]

B:BD[4.89970] → [3.43052:43106]

}
void clear_cset_overrides()
{
    memset(cset_override, 0, sizeof cset_override);
}
static unsigned short read_symbol(std::string s)
{
    if (s.empty())
        return (0);
    if (s.length() == 1)
        return s[0];
    if (s[0] == '\\')
        s = s.substr(1);
    
    int feat = atoi(s.c_str());
    if (feat < 0)
        feat = 0;
    return static_cast<unsigned short>(feat);
}
void add_cset_override(char_set_type set, dungeon_char_type dc,
                       unsigned char symbol)
{
    cset_override[set][dc] = symbol;
}
void add_cset_override(char_set_type set, const std::string &overrides)
{
    std::vector<std::string> overs = split_string(",", overrides);
    for (int i = 0, size = overs.size(); i < size; ++i)
    {
        std::vector<std::string> mapping = split_string(":", overs[i]);
        if (mapping.size() != 2)
            continue;
        
        dungeon_char_type dc = dchar_by_name(mapping[0]);
        if (dc == NUM_DCHAR_TYPES)
            continue;
        
        unsigned char symbol = 
            static_cast<unsigned char>(read_symbol(mapping[1]));
        if (set == NUM_CSET)
            for (int c = 0; c < NUM_CSET; ++c)
                add_cset_override(char_set_type(c), dc, symbol);
        else
            add_cset_override(set, dc, symbol);
    }

Replacement in crawl-ref/source/view.cc at line 2610 [4.16817]

B:BD[3.43205] → [3.43205:43299]

        if (cset_override[set][i])
            Options.char_table[i] = cset_override[set][i];

[3.43205]

[3.43299]

        if (Options.cset_override[set][i])
            Options.char_table[i] = Options.cset_override[set][i];

Deletion in crawl-ref/source/view.cc at line 2615 [4.16817]
B:BD[3.43369] → [3.43369:43371]
∅:D[3.43371] → [4.90098:90099]
B:BD[4.90098] → [4.90098:90099]
B:BD[4.90099] → [3.43372:43436]
```
}
void clear_feature_overrides()
{
    Feature_Overrides.clear();
```

Deletion in crawl-ref/source/view.cc at line 2616 [4.16817]

∅:D[3.43438] → [4.90182:90183]

B:BD[4.90182] → [4.90182:90183]

B:BD[4.90183] → [3.43439:43594]


void add_feature_override(const std::string &text)
{
    std::string::size_type epos = text.rfind("}");
    if (epos == std::string::npos)
        return;

Deletion in crawl-ref/source/view.cc at line 2617 [4.16817]

B:BD[4.90279] → [3.43595:43894]

∅:D[3.43894] → [4.90371:90372]

B:BD[4.90371] → [4.90371:90372]

B:BD[4.90372] → [3.43895:43959]

∅:D[3.43959] → [4.90460:90461]

B:BD[4.90460] → [4.90460:90461]

B:BD[4.90461] → [3.43960:44013]

∅:D[3.44013] → [4.90544:90545]

B:BD[4.90544] → [4.90544:90545]

B:BD[4.90545] → [3.44014:44148]

∅:D[3.44148] → [4.90677:90678]

B:BD[4.90677] → [4.90677:90678]

B:BD[4.90678] → [3.44149:44616]

∅:D[3.44616] → [4.90770:90771]

B:BD[4.90770] → [4.90770:90771]

B:BD[4.90771] → [3.44617:44667]

∅:D[3.44667] → [4.90922:90923]

B:BD[4.90922] → [4.90922:90923]

    std::string::size_type spos = text.rfind("{", epos);
    if (spos == std::string::npos)
        return;
    
    std::string fname = text.substr(0, spos);
    std::string props = text.substr(spos + 1, epos - spos - 1);
    std::vector<std::string> iprops = split_string(",", props, true, true);
    if (iprops.size() < 1 || iprops.size() > 5)
        return;
    if (iprops.size() < 5)
        iprops.resize(5);
    trim_string(fname);
    std::vector<dungeon_feature_type> feats = features_by_desc(fname);
    if (feats.empty())
        return;
    for (int i = 0, size = feats.size(); i < size; ++i)
    {
        feature_override fov;
        fov.feat = feats[i];
        
        fov.override.symbol         = read_symbol(iprops[0]);
        fov.override.magic_symbol   = read_symbol(iprops[1]);
        fov.override.colour         = str_to_colour(iprops[2], BLACK);
        fov.override.map_colour     = str_to_colour(iprops[3], BLACK);
        fov.override.seen_colour    = str_to_colour(iprops[4], BLACK);
        Feature_Overrides.push_back(fov);
    }
}

Replacement in crawl-ref/source/view.cc at line 2619 [4.16817]

B:BD[3.44701] → [3.44701:44769]

    for (int i = 0, size = Feature_Overrides.size(); i < size; ++i)

[3.44701]

[3.44769]

    for (int i = 0, size = Options.feature_overrides.size(); i < size; ++i)

Replacement in crawl-ref/source/view.cc at line 2621 [4.16817]

B:BD[3.44775] → [3.44775:44843]

        const feature_override      &fov    = Feature_Overrides[i];

[3.44775]

[3.44843]

        const feature_override      &fov    = Options.feature_overrides[i];

Insertion in crawl-ref/source/initfile.cc at line 27 [4.2957258]
[3.785053]
[5.390989]
```
#include "direct.h"
```

Insertion in crawl-ref/source/initfile.cc at line 700 [4.2957258]

[5.397063]

}
void game_options::clear_cset_overrides()
{
    memset(cset_override, 0, sizeof cset_override);
}
void game_options::clear_feature_overrides()
{
    feature_overrides.clear();
}
static unsigned short read_symbol(std::string s)
{
    if (s.empty())
        return (0);
    if (s.length() == 1)
        return s[0];
    if (s[0] == '\\')
        s = s.substr(1);
    
    int feat = atoi(s.c_str());
    if (feat < 0)
        feat = 0;
    return static_cast<unsigned short>(feat);
}
void game_options::add_feature_override(const std::string &text)
{
    std::string::size_type epos = text.rfind("}");
    if (epos == std::string::npos)
        return;
    std::string::size_type spos = text.rfind("{", epos);
    if (spos == std::string::npos)
        return;
    
    std::string fname = text.substr(0, spos);
    std::string props = text.substr(spos + 1, epos - spos - 1);
    std::vector<std::string> iprops = split_string(",", props, true, true);
    if (iprops.size() < 1 || iprops.size() > 5)
        return;
    if (iprops.size() < 5)
        iprops.resize(5);
    trim_string(fname);
    std::vector<dungeon_feature_type> feats = features_by_desc(fname);
    if (feats.empty())
        return;
    for (int i = 0, size = feats.size(); i < size; ++i)
    {
        feature_override fov;
        fov.feat = feats[i];
        
        fov.override.symbol         = read_symbol(iprops[0]);
        fov.override.magic_symbol   = read_symbol(iprops[1]);
        fov.override.colour         = str_to_colour(iprops[2], BLACK);
        fov.override.map_colour     = str_to_colour(iprops[3], BLACK);
        fov.override.seen_colour    = str_to_colour(iprops[4], BLACK);
        feature_overrides.push_back(fov);
    }

Insertion in crawl-ref/source/initfile.cc at line 768 [4.2957258]

[4.2966690]

[3.796074]

void game_options::add_cset_override(
        char_set_type set, const std::string &overrides)
{
    std::vector<std::string> overs = split_string(",", overrides);
    for (int i = 0, size = overs.size(); i < size; ++i)
    {
        std::vector<std::string> mapping = split_string(":", overs[i]);
        if (mapping.size() != 2)
            continue;
        
        dungeon_char_type dc = dchar_by_name(mapping[0]);
        if (dc == NUM_DCHAR_TYPES)
            continue;
        
        unsigned char symbol = 
            static_cast<unsigned char>(read_symbol(mapping[1]));
        if (set == NUM_CSET)
            for (int c = 0; c < NUM_CSET; ++c)
                add_cset_override(char_set_type(c), dc, symbol);
        else
            add_cset_override(set, dc, symbol);
    }
}
void game_options::add_cset_override(char_set_type set, dungeon_char_type dc,
                                     unsigned char symbol)
{
    cset_override[set][dc] = symbol;
}

Insertion in crawl-ref/source/externs.h at line 702 [4.3270163]

[5.442371]

};
struct feature_def
{
    unsigned short      symbol;          // symbol used for seen terrain
    unsigned short      magic_symbol;    // symbol used for magic-mapped terrain
    unsigned short      colour;          // normal in LoS colour
    unsigned short      map_colour;      // colour when out of LoS on display
    unsigned short      seen_colour;     // map_colour when is_terrain_seen()
    bool                notable;         // gets noted when seen
    bool                seen_effect;     // requires special handling when seen
};
struct feature_override
{
    dungeon_feature_type    feat;
    feature_def             override;

Insertion in crawl-ref/source/externs.h at line 733 [4.3270163]

[3.898495]

    // View options
    std::vector<feature_override> feature_overrides;
    unsigned cset_override[NUM_CSET][NUM_DCHAR_TYPES];

Replacement in crawl-ref/source/externs.h at line 782 [4.3270163]

B:BD[4.3285103] → [5.443621:443698]

    bool        macro_meta_entry; // Allow user to use \{foo} sequences when

[4.3285103]

[5.443698]

    bool        macro_meta_entry; // Allow user to use numeric sequences when

Insertion in crawl-ref/source/externs.h at line 930 [4.3270163]

[3.901308]

    void clear_feature_overrides();
    void clear_cset_overrides();
    void add_cset_override(char_set_type set, const std::string &overrides);
    void add_cset_override(char_set_type set, dungeon_char_type dc,
                           unsigned char symbol);
    void add_feature_override(const std::string &);