fiddlerwoaroof/crawl - Change QAZNQSLHE4QJC3DFI3XXAMFNVRJPCHOYCFGXENAOSKWYFTL2B3YQC

Adding you.in_branch(string) as a lua function.

This also removes you.where_are_you() so as not to require lua scripts to know the value of C++ enums. This change also fixes stricmp incorrectly falling through to strcmp on non-MSVC platforms.

Created by Enne Walker on October 31, 2009

QAZNQSLHE4QJC3DFI3XXAMFNVRJPCHOYCFGXENAOSKWYFTL2B3YQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/libutil.h at line 37 [7.2493627]

[5.3477]

[6.25371]


#ifdef UNIX
extern "C" int stricmp(const char *str1, const char *str2);
#endif

Insertion in crawl-ref/source/libutil.cc at line 222 [7.2494093]

[5.4081]

[6.25638]

}
#ifdef UNIX
extern "C" int stricmp(const char *str1, const char *str2)
{
    int ret = 0;
    // No need to check for *str1.  If str1 ends, then tolower(*str1) will be
    // 0, ret will be -1, and the loop will break.
    while (!ret && *str2)
    {
        unsigned char c1 = tolower(*str1);
        unsigned char c2 = tolower(*str2);
        
        ret = c1 - c2;
        str1++;
        str2++; 
    }
    if (ret < 0)
        ret = -1;
    else if (ret > 0)
        ret = 1;
    return (ret);

Insertion in crawl-ref/source/libutil.cc at line 248 [7.2494093]
[6.25640]
[6.25640]
```
#endif
```
Deletion in crawl-ref/source/libunix.h at line 43 [7.2548819]
B:BD[8.477] → [2.3105:3165]
```
extern "C" int stricmp(const char *str1, const char *str2);
```
Deletion in crawl-ref/source/libunix.cc at line 1131 [7.2550041]
B:BD[7.2569527] → [7.2569527:2569528]
Deletion in crawl-ref/source/libunix.cc at line 1132 [7.2550041]
B:BD[7.2569529] → [2.3246:3307]
∅:D[2.3307] → [7.2569579:2569618]
B:BD[7.2569579] → [7.2569579:2569618]
```
extern "C" int stricmp( const char *str1, const char *str2 )
{
    return (strcmp(str1, str2));
}
```
Deletion in crawl-ref/source/libgui.h at line 70 [10.5789586]
B:BD[9.167322] → [9.167322:167371]
```
int stricmp(const char *str1, const char *str2);
```
Deletion in crawl-ref/source/libgui.cc at line 408 [10.5793336]
B:BD[10.5847463] → [9.170084:170132]
∅:D[9.170132] → [10.5847507:5847509]
B:BD[10.5847507] → [10.5847507:5847509]
B:BD[10.5847509] → [9.170133:170166]
∅:D[11.2959] → [10.5847509:5847511]
∅:D[9.170166] → [10.5847509:5847511]
B:BD[10.5847509] → [10.5847509:5847511]
B:BD[10.5847511] → [9.170167:170168]
```
int stricmp(const char *str1, const char *str2)
{
    return (strcmp(str1, str2));
}
```
Insertion in crawl-ref/source/l_you.cc at line 7 [13.2866]
[12.2878]
[12.2878]
```
#include "branch.h"
```

Insertion in crawl-ref/source/l_you.cc at line 278 [13.2866]

[14.3065]

[4.2878]


LUAFN(you_in_branch)
{
    const char* name = luaL_checkstring(ls, 1);
    int br = NUM_BRANCHES;

Replacement in crawl-ref/source/l_you.cc at line 285 [13.2866]

B:BD[4.2879] → [4.2879:2933]

LUARET1(you_where_are_you, number, you.where_are_you)

[4.2879]

[13.3959]

    for (int i = 0; i < NUM_BRANCHES; i++)
    {
        if (stricmp(name, branches[i].shortname) == 0
            || stricmp(name, branches[i].longname) == 0
            || stricmp(name, branches[i].abbrevname) == 0)
        {
            if (br != NUM_BRANCHES)
            {
                std::string err = make_stringf(
                    "'%s' matches both branch '%s' and '%s'",
                    name, branches[br].abbrevname,
                    branches[i].abbrevname);
                return (luaL_argerror(ls, 1, err.c_str()));
            }
            br = i;
        }
    }
    if (br == NUM_BRANCHES)
    {
        std::string err = make_stringf("'%s' matches no branches.", name);
        return (luaL_argerror(ls, 1, err.c_str()));
    }

Insertion in crawl-ref/source/l_you.cc at line 309 [13.2866]

[13.3960]

[3.2856]

    bool in_branch = (br == you.where_are_you);
    PLUARET(boolean, in_branch);
}

Replacement in crawl-ref/source/l_you.cc at line 327 [13.2866]
B:BD[4.2970] → [4.2970:3015]
```
{ "where_are_you",      you_where_are_you },
```
[4.2970]
[15.4024]
```
{ "in_branch",          you_in_branch },
```
Replacement in crawl-ref/source/dat/volcano.des at line 285 [16.2965]
B:BD[4.3532] → [4.3532:3569]
```
    if you.where_are_you() == 2 then
```
[4.3532]
[4.3569]
```
    if you.in_branch("orc") then
```
Replacement in crawl-ref/source/dat/volcano.des at line 302 [16.2965]
B:BD[4.4104] → [4.4104:4141]
```
    if you.where_are_you() == 2 then
```
[4.4104]
[4.4141]
```
    if you.in_branch("orc") then
```
Replacement in crawl-ref/source/dat/volcano.des at line 328 [16.2965]
B:BD[4.5414] → [4.5414:5451]
```
    if you.where_are_you() == 2 then
```
[4.5414]
[4.5451]
```
    if you.in_branch("orc") then
```

Adding you.in_branch(string) as a lua function.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/libutil.h at line 37 [7.2493627]

Insertion in crawl-ref/source/libutil.cc at line 222 [7.2494093]

Insertion in crawl-ref/source/libutil.cc at line 248 [7.2494093]

Deletion in crawl-ref/source/libunix.h at line 43 [7.2548819]

Deletion in crawl-ref/source/libunix.cc at line 1131 [7.2550041]

Deletion in crawl-ref/source/libunix.cc at line 1132 [7.2550041]

Deletion in crawl-ref/source/libgui.h at line 70 [10.5789586]

Deletion in crawl-ref/source/libgui.cc at line 408 [10.5793336]

Insertion in crawl-ref/source/l_you.cc at line 7 [13.2866]

Insertion in crawl-ref/source/l_you.cc at line 278 [13.2866]

Replacement in crawl-ref/source/l_you.cc at line 285 [13.2866]

Insertion in crawl-ref/source/l_you.cc at line 309 [13.2866]

Replacement in crawl-ref/source/l_you.cc at line 327 [13.2866]

Replacement in crawl-ref/source/dat/volcano.des at line 285 [16.2965]

Replacement in crawl-ref/source/dat/volcano.des at line 302 [16.2965]

Replacement in crawl-ref/source/dat/volcano.des at line 328 [16.2965]