fiddlerwoaroof/crawl - Change QWDHN7GEXJ5MFYOH2H2JWQMQGVLNALFS4WZT4S6VNCXLZEOIVPWAC

Fixed issues with substring matches of item names (spears being generated for

pears) in maps (David). The change also means that item names have to be specified in full in map definitions.

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

Created by dshaligram on September 28, 2007

QWDHN7GEXJ5MFYOH2H2JWQMQGVLNALFS4WZT4S6VNCXLZEOIVPWAC

Dependencies

In channels

main

Change contents

Deletion in crawl-ref/source/items.cc at line 2956 [4.2584728]
B:BD[3.145584] → [3.145584:145613]
```
    int best_index  = 10000;
```
Deletion in crawl-ref/source/items.cc at line 2957 [4.2584728]
B:BD[3.145648] → [3.145648:145669]
```
    const char *ptr;
```

Replacement in crawl-ref/source/items.cc at line 2960 [4.2584728]

B:BD[5.8756] → [5.8756:8869]

∅:D[5.8869] → [3.145793:145875]

B:BD[3.145793] → [3.145793:145875]

        char obj_name[ITEMNAME_SIZE];
        strncpy(obj_name, item.name(DESC_PLAIN).c_str(), sizeof obj_name);
        ptr = strstr( strlwr(obj_name), name.c_str() );
        if (ptr != NULL)

[5.8756]

[3.145875]

        if (name == lowercase_string(item.name(DESC_PLAIN)))

Replacement in crawl-ref/source/items.cc at line 2962 [4.2584728]

B:BD[3.145885] → [3.145885:146084]

            // earliest match is the winner
            if (ptr - obj_name < best_index)
            {
                type_wanted = i;    
                best_index = ptr - obj_name;
            }

[3.145885]

[3.146084]

            type_wanted = i;
            break;

Replacement in crawl-ref/source/dat/orc.des at line 26 [6.63762]

B:BD[6.64600] → [6.64600:64675]

ITEM: % / scroll of teleport / scroll of remove curse / scroll of identify

[6.64600]

[6.64675]

ITEM: % / scroll of teleportation / scroll of remove curse / scroll of identify

Replacement in crawl-ref/source/dat/mini.des at line 1129 [6.75280]

B:BD[6.94879] → [7.1045:1129]

ITEM:    potion of gain intelligence/potion of experience/w:40 potion of heal wound

[6.94879]

[7.1129]

ITEM:    potion of gain intelligence/potion of experience/w:40 potion of heal wounds

Replacement in crawl-ref/source/dat/float.des at line 87 [6.216297]

B:BD[2.7138] → [2.7138:7213]

ITEM:    potion of heal wounds / speed / berserk rage / scroll of blinking

[2.7138]

[6.222276]

ITEM:    potion of heal wounds / potion of speed / potion of berserk rage / scroll of blinking

Replacement in crawl-ref/source/dat/entry.des at line 1559 [8.591]

∅:D[6.233461] → [8.49722:49799]

B:BD[8.49722] → [8.49722:49799]

ITEM: nothing / ring of hunger / protection from fire / protection from cold

[6.233461]

[8.50912]

ITEM: nothing / ring of hunger / ring of protection from fire / ring of protection from cold