fiddlerwoaroof/crawl - Change EWU6VHNZ72GMGR5KY4EQ56SEHUJGLQG5OGIHPZWAZAO64FAY2YZQC

Changing rltiles to store name -> idx lookup in a straight array, rather than a std::map. (This should hopefully fix Johanna's compile troubles.)

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

Created by ennewalker on December 7, 2008

EWU6VHNZ72GMGR5KY4EQ56SEHUJGLQG5OGIHPZWAZAO64FAY2YZQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/rltiles/tool/tile_list_processor.cc at line 8 [4.19785]
[2.350]
[4.19879]
```
#include <map>
```
Deletion in crawl-ref/source/rltiles/tool/tile_list_processor.cc at line 650 [4.19785]
B:BD[4.35418] → [5.16446:16487]
```
        fprintf(fp, "#include <map>\n");
```

Replacement in crawl-ref/source/rltiles/tool/tile_list_processor.cc at line 730 [4.19785]

B:BD[5.16636] → [5.16636:16878]

        fprintf(fp, "\nclass tile_%s_map : public map<string, int>\n"
            "{\n"
            "public:\n"
            "    tile_%s_map();\n"
            "} %s_name_map;\n\n",
            lcname.c_str(), lcname.c_str(), lcname.c_str());

[5.16636]

[5.16878]

        fprintf(fp, "\ntypedef std::pair<const char*, int> _tile_pair;\n\n");

Replacement in crawl-ref/source/rltiles/tool/tile_list_processor.cc at line 733 [4.19785]
B:BD[5.16899] → [5.16899:16942]
```
            "tile_%s_map::tile_%s_map()\n"
```
[5.16899]
[3.439]
```
            "_tile_pair %s_map_pairs[] =\n"
```

Replacement in crawl-ref/source/rltiles/tool/tile_list_processor.cc at line 735 [4.19785]

∅:D[3.458] → [5.17023:17068]

B:BD[5.17023] → [5.17023:17068]

            lcname.c_str(), lcname.c_str());

[3.458]

[5.17068]

            lcname.c_str());
        typedef std::map<std::string, int> sort_map;
        sort_map table;

Replacement in crawl-ref/source/rltiles/tool/tile_list_processor.cc at line 751 [4.19785]

B:BD[5.17482] → [3.459:547]

∅:D[3.547] → [5.17575:17634]

B:BD[5.17575] → [5.17575:17634]

            fprintf(fp, "    insert(map<string, int>::value_type(\"%s\", %d + %s));\n",
                lcenum.c_str(), i, m_start_value.c_str());

[5.17482]

[4.37328]

            table.insert(sort_map::value_type(lcenum, i));

Replacement in crawl-ref/source/rltiles/tool/tile_list_processor.cc at line 754 [4.19785]

B:BD[5.17636] → [5.17636:17666]

        fprintf(fp, "}\n\n");

[5.17636]

[5.17666]

        sort_map::iterator itor;
        for (itor = table.begin(); itor != table.end(); itor++)
        {
            fprintf(fp, "    _tile_pair(\"%s\", %d + %s),\n",
                itor->first.c_str(), itor->second, m_start_value.c_str());
        }
        fprintf(fp, "};\n\n");

Replacement in crawl-ref/source/rltiles/tool/tile_list_processor.cc at line 774 [4.19785]

B:BD[5.18061] → [5.18061:18230]

            "    map<string, int>::const_iterator itr = %s_name_map.find(lc);\n"
            "    if (itr == %s_name_map.end())\n"
            "        return false;\n"

[5.18061]

[5.18230]

            "    int num_pairs = sizeof(%s_map_pairs) / sizeof(%s_map_pairs[0]);\n"

Replacement in crawl-ref/source/rltiles/tool/tile_list_processor.cc at line 776 [4.19785]

B:BD[5.18247] → [5.18247:18319]

            "    idx = itr->second;\n"
            "    return true;\n"

[5.18247]

[5.18319]

            "    int first = 0;\n"
            "    int last = num_pairs - 1;\n"
            "\n"
            "    do\n"
            "    {\n"
            "        int half = (last - first) / 2 + first;\n"
            "        int cmp = strcmp(str, %s_map_pairs[half].first);\n"
            "        if (cmp < 0)\n"
            "            last = half - 1;\n"
            "        else if (cmp > 0)\n"
            "            first = half + 1;\n"
            "        else\n"
            "        {\n"
            "            idx = %s_map_pairs[half].second;\n"
            "            return true;\n"
            "        }\n"
            "\n"
            "    } while (first <= last);\n"
            "\n"
            "    return false;\n"

Replacement in crawl-ref/source/rltiles/tool/tile_list_processor.cc at line 797 [4.19785]

B:BD[5.18338] → [5.18338:18399]

            lcname.c_str(), lcname.c_str(), lcname.c_str());

[5.18338]

[4.37338]

            lcname.c_str(), lcname.c_str(), lcname.c_str(), lcname.c_str(), lcname.c_str());