fiddlerwoaroof/crawl - Change 32TNF7QPH765BC6VP4KVA4R2REGP6VI7CJ7QW2OOGP66Y7CUNQWQC

desc_search bugs (1905764)

Fix: error for too many matches is not displayed
Fix: rakshasa cannot be looked up (duplicate entries in Mon_Name_Cache)
Fix: can't look up monster by the symbol ' '
Didn't fix: can't look up plain draconians. mon_global_level() for them returns 0, so they're getting filtered out by monster_filter. But I don't know why the filter checks for 0, so I don't want to remove it.
Didn't fix: simulacrum lookup The monster name in mon-data.h is "large simulacrum" and "small simulacrum". However, name in the DB is "simulacrum". The regexp matches the db key "simulacrum", then tries to look up the monster id and matches nothing. I think the right fix is to change the db? But I'm not sure right now.

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

Created by pauldubois on March 17, 2008

32TNF7QPH765BC6VP4KVA4R2REGP6VI7CJ7QW2OOGP66Y7CUNQWQC

Dependencies

In channels

main

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 163 [5.1699344]
B:BD[4.1932] → [4.1932:1968]
```
static mon_name_map mon_name_cache;
```
[4.1932]
[4.1968]
```
static mon_name_map Mon_Name_Cache;
```

Replacement in crawl-ref/source/mon-util.cc at line 175 [5.1699344]

B:BD[4.2251] → [4.2251:2287]

        mon_name_cache[name] = mon;

[4.2251]

[4.2287]

        // Deal sensibly with duplicate entries; refuse or allow the insert,
        // depending on which should take precedence.  Mostly we don't care,
        // except looking up "rakshasa" and getting _FAKE breaks ?/M rakshasa.
        if (Mon_Name_Cache.find(name) != Mon_Name_Cache.end())
        {
            if (mon == MONS_RAKSHASA_FAKE ||
                mon == MONS_ARMOUR_MIMIC ||
                mon == MONS_SCROLL_MIMIC ||
                mon == MONS_POTION_MIMIC ||
                mon == MONS_ABOMINATION_LARGE)
            {
                // keep previous entry
                continue;
            }
            else
            {
                DEBUGSTR("Un-handled duplicate monster name: %s", name.c_str());
                ASSERT(false);
            }
        }
        Mon_Name_Cache[name] = mon;

Replacement in crawl-ref/source/mon-util.cc at line 206 [5.1699344]

B:BD[4.2315] → [4.2315:2377]

        mon_name_map::iterator i = mon_name_cache.find(name);

[4.2315]

[4.2377]

        mon_name_map::iterator i = Mon_Name_Cache.find(name);

Replacement in crawl-ref/source/mon-util.cc at line 208 [5.1699344]
B:BD[4.2378] → [4.2378:2417]
```
        if (i != mon_name_cache.end())
```
[4.2378]
[4.2417]
```
        if (i != Mon_Name_Cache.end())
```
Deletion in crawl-ref/source/command.cc at line 653 [5.4082507]
B:BD[6.2089] → [7.4751:4795]
B:BD[7.4795] → [8.3189:3190]
```
static std::string list_commands_err = "";
```
Replacement in crawl-ref/source/command.cc at line 963 [5.4082507]
B:BD[8.7157] → [3.689:731]
```
static bool find_description(bool &again)
```
[8.7157]
[8.7188]
```
static bool find_description(bool &again, std::string& error_inout)
```

Insertion in crawl-ref/source/command.cc at line 970 [5.4082507]

[8.7234]

[4.52193]

    if (! error_inout.empty())
        mpr(error_inout.c_str(), MSGCH_PROMPT);

Replacement in crawl-ref/source/command.cc at line 1030 [5.4082507]
B:BD[8.7804] → [8.7804:7847]
```
        list_commands_err = "Okay, then.";
```
[8.7804]
[3.752]
```
        error_inout = "Okay, then.";
```
Replacement in crawl-ref/source/command.cc at line 1046 [5.4082507]
B:BD[9.8152] → [9.8152:8199]
```
            list_commands_err = "Okay, then.";
```
[9.8152]
[9.8199]
```
            error_inout = "Okay, then.";
```

Replacement in crawl-ref/source/command.cc at line 1050 [5.4082507]

B:BD[8.8172] → [9.8238:8275]

        regex = trimmed_string(buf);

[8.8172]

[8.8217]

        if (strlen(buf) == 1)
            regex = buf;
        else
            regex = trimmed_string(buf);

Replacement in crawl-ref/source/command.cc at line 1057 [5.4082507]

B:BD[9.8311] → [9.8311:8380]

            list_commands_err = "Description must contain at least "

[9.8311]

[9.8380]

            error_inout = "Description must contain at least "

Replacement in crawl-ref/source/command.cc at line 1099 [5.4082507]

B:BD[8.8984] → [8.8984:9124]

            list_commands_err  = "No monsters with symbol '";
            list_commands_err += regex;
            list_commands_err += "'";

[8.8984]

[8.9124]

            error_inout  = "No monsters with symbol '";
            error_inout += regex;
            error_inout += "'";

Replacement in crawl-ref/source/command.cc at line 1105 [5.4082507]

B:BD[4.52977] → [4.52977:53114]

            list_commands_err  = "No items with symbol '";
            list_commands_err += regex;
            list_commands_err += "'";

[4.52977]

[4.53114]

            error_inout  = "No items with symbol '";
            error_inout += regex;
            error_inout += "'";

Replacement in crawl-ref/source/command.cc at line 1111 [5.4082507]

B:BD[8.9157] → [8.9157:9283]

            list_commands_err  = "No matching ";
            list_commands_err += type;
            list_commands_err += "s";

[8.9157]

[8.9283]

            error_inout  = "No matching ";
            error_inout += type;
            error_inout += "s";

Replacement in crawl-ref/source/command.cc at line 1121 [5.4082507]

B:BD[8.9401] → [8.9401:9558]

            list_commands_err  = "Too many monsters with symbol '";
            list_commands_err += regex;
            list_commands_err += "' to display";

[8.9401]

[8.9558]

            error_inout  = "Too many monsters with symbol '";
            error_inout += regex;
            error_inout += "' to display";

Replacement in crawl-ref/source/command.cc at line 1130 [5.4082507]
B:BD[2.499] → [2.499:541]
```
            list_commands_err = os.str();
```
[2.499]
[8.9899]
```
            error_inout = os.str();
```
Insertion in crawl-ref/source/command.cc at line 1248 [5.4082507]
[3.1288]
[3.1288]
```
        std::string error;
```
Replacement in crawl-ref/source/command.cc at line 1250 [5.4082507]
B:BD[3.1301] → [3.1301:1342]
```
            if (find_description(again))
```
[3.1301]
[3.1342]
```
            if (find_description(again, error))
```
Insertion in crawl-ref/source/command.cc at line 1254 [5.4082507]
[3.1430]
[3.1430]
```
            {
```
Insertion in crawl-ref/source/command.cc at line 1256 [5.4082507]
[3.1460]
[3.1460]
```
            }
```
Deletion in crawl-ref/source/command.cc at line 1638 [5.4082507]
B:BD[10.7462] → [7.11056:11084]
```
    list_commands_err = "";
```
Deletion in crawl-ref/source/command.cc at line 1645 [5.4082507]
B:BD[7.11167] → [7.11167:11241]
```
    if (list_commands_err != "")
        mpr(list_commands_err.c_str());
```

desc_search bugs (1905764)

Dependencies

In channels

Change contents

Replacement in crawl-ref/source/mon-util.cc at line 163 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 175 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 206 [5.1699344]

Replacement in crawl-ref/source/mon-util.cc at line 208 [5.1699344]

Deletion in crawl-ref/source/command.cc at line 653 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 963 [5.4082507]

Insertion in crawl-ref/source/command.cc at line 970 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1030 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1046 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1050 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1057 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1099 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1105 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1111 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1121 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1130 [5.4082507]

Insertion in crawl-ref/source/command.cc at line 1248 [5.4082507]

Replacement in crawl-ref/source/command.cc at line 1250 [5.4082507]

Insertion in crawl-ref/source/command.cc at line 1254 [5.4082507]

Insertion in crawl-ref/source/command.cc at line 1256 [5.4082507]

Deletion in crawl-ref/source/command.cc at line 1638 [5.4082507]

Deletion in crawl-ref/source/command.cc at line 1645 [5.4082507]