fiddlerwoaroof/crawl - Change NOQ4LTFDCNNSHUE2AHXYBVXUTTXBDZOHNCK5V4TWVDBIYRC3VUCQC

Split level and branch functions out of l_dgn.cc.

Created by Robert Vollmert on October 20, 2009

NOQ4LTFDCNNSHUE2AHXYBVXUTTXBDZOHNCK5V4TWVDBIYRC3VUCQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/makefile.obj at line 45 [5.79]
[4.2843]
[4.2843]
```
l_dgnlvl.o \
```
Insertion in crawl-ref/source/l_libs.h at line 19 [6.2907]
[4.2979]
[4.2979]
```
extern const struct luaL_reg dgn_level_lib[];
```
Insertion in crawl-ref/source/l_libs.h at line 78 [6.2907]
[3.4861]
[3.4861]
```
level_id dlua_level_id(lua_State *ls, int ndx);
```

File addition: l_dgnlvl.cc (----------)

[7.24]

/*
 * File:      l_dgnlvl.cc
 * Summary:   Level and branch bindings (library "dgn").
 */
#include "AppHdr.h"
#include "dlua.h"
#include "l_libs.h"
#include "branch.h"
#define BRANCH(br, pos)                                                 \
const char *branch_name = luaL_checkstring(ls, pos);                \
branch_type req_branch_type = str_to_branch(branch_name);           \
if (req_branch_type == NUM_BRANCHES)                                \
luaL_error(ls, "Expected branch name");                         \
Branch &br = branches[req_branch_type]
#define BRANCHFN(name, type, expr)   \
LUAFN(dgn_br_##name) {           \
BRANCH(br, 1);                   \
PLUARET(type, expr);             \
}
BRANCHFN(floorcol, number, br.floor_colour)
BRANCHFN(rockcol, number, br.rock_colour)
BRANCHFN(has_shops, boolean, br.has_shops)
BRANCHFN(has_uniques, boolean, br.has_uniques)
BRANCHFN(parent_branch, string,
         br.parent_branch == NUM_BRANCHES
             ? ""
             : branches[br.parent_branch].abbrevname)
static void _push_level_id(lua_State *ls, const level_id &lid)
{
    // We're skipping the constructor; naughty, but level_id has no
    // virtual methods and no dynamically allocated memory.
    level_id *nlev =
    static_cast<level_id*>(lua_newuserdata(ls, sizeof(level_id)));
    *nlev = lid;
}
level_id dlua_level_id(lua_State *ls, int ndx)
{
    if (lua_isstring(ls, ndx))
    {
        const char *s = lua_tostring(ls, 1);
        try
        {
            return level_id::parse_level_id(s);
        }
        catch (const std::string &err)
        {
            luaL_error(ls, err.c_str());
        }
    }
    else if (lua_isuserdata(ls, ndx))
    {
        const level_id *lid = static_cast<level_id*>(lua_touserdata(ls, ndx));
        return (*lid);
    }
    
    luaL_argerror(ls, ndx, "Expected level_id");
    // Never gets here.
    return level_id();
}
LUAFN(dgn_level_id)
{
    const int nargs = lua_gettop(ls);
    if (!nargs)
        _push_level_id(ls, level_id::current());
    else if (nargs == 1)
        _push_level_id(ls, dlua_level_id(ls, 1));
    return (1);
}
LUAFN(dgn_level_name)
{
    const level_id lid(dlua_level_id(ls, 1));
    lua_pushstring(ls, lid.describe().c_str());
    return (1);
}
LUAFN(dgn_set_level_type_name)
{
    if (you.level_type != LEVEL_PORTAL_VAULT)
    {
        luaL_error(ls, "Can only set level type name on portal vaults");
        return(0);
    }
    
    if (!lua_isstring(ls, 1))
    {
        luaL_argerror(ls, 1, "Expected string for level type name");
        return(0);
    }
    
    you.level_type_name = luaL_checkstring(ls, 1);
    
    return(0);
}
LUAFN(dgn_set_level_type_name_abbrev)
{
    if (you.level_type != LEVEL_PORTAL_VAULT)
    {
        luaL_error(ls, "Can only set level type name abbreviation on "
                   "portal vaults");
        return(0);
    }
    
    if (!lua_isstring(ls, 1))
    {
        luaL_argerror(ls, 1, "Expected string for level type name "
                      "abbreviation");
        return(0);
    }
    
    you.level_type_name_abbrev = luaL_checkstring(ls, 1);
    
    return(0);
}
LUAFN(dgn_set_level_type_origin)
{
    if (you.level_type != LEVEL_PORTAL_VAULT)
    {
        luaL_error(ls, "Can only set level type origin on portal vaults");
        return(0);
    }
    
    if (!lua_isstring(ls, 1))
    {
        luaL_argerror(ls, 1, "Expected string for level type origin");
        return(0);
    }
    
    you.level_type_origin = luaL_checkstring(ls, 1);
    
    return(0);
}
const struct luaL_reg dgn_level_lib[] =
{
{ "br_floorcol", dgn_br_floorcol },
{ "br_rockcol", dgn_br_rockcol },
{ "br_has_shops", dgn_br_has_shops },
{ "br_has_uniques", dgn_br_has_uniques },
{ "br_parent_branch", dgn_br_parent_branch },
{ "level_id", dgn_level_id },
{ "level_name", dgn_level_name },
{ "set_level_type_name", dgn_set_level_type_name },
{ "set_level_type_name_abbrev", dgn_set_level_type_name_abbrev },
{ "set_level_type_origin", dgn_set_level_type_origin },
{ NULL, NULL }
};

Deletion in crawl-ref/source/l_dgn.cc at line 1916 [9.1232]

B:BD[8.8778] → [8.8778:8797]

∅:D[8.8797] → [10.7062:7136]

B:BD[10.7062] → [10.7062:7136]

B:BD[10.7136] → [11.11855:12170]

∅:D[11.12170] → [10.7475:7515]

B:BD[10.7475] → [10.7475:7515]

B:BD[10.7515] → [11.12171:12278]

∅:D[10.7638] → [12.7160:7161]

∅:D[11.12278] → [12.7160:7161]

B:BD[12.7160] → [12.7160:7161]

B:BD[12.7161] → [10.7639:7944]

∅:D[11.12805] → [13.2880:3094]

∅:D[14.93321] → [13.2880:3094]

B:BD[10.7944] → [13.2880:3094]

B:BD[13.3094] → [11.12806:12873]

∅:D[11.12873] → [13.3165:3661]

B:BD[13.3165] → [13.3165:3661]

B:BD[13.3661] → [11.12874:12879]

∅:D[11.12879] → [13.3662:3959]

B:BD[13.3662] → [13.3662:3959]

    return (1);
}
#define BRANCH(br, pos)                                                 \
const char *branch_name = luaL_checkstring(ls, pos);                \
branch_type req_branch_type = str_to_branch(branch_name);           \
if (req_branch_type == NUM_BRANCHES)                                \
luaL_error(ls, "Expected branch name");                         \
Branch &br = branches[req_branch_type]
#define BRANCHFN(name, type, expr)   \
LUAFN(dgn_br_##name) {           \
BRANCH(br, 1);                   \
PLUARET(type, expr);             \
}
BRANCHFN(floorcol, number, br.floor_colour)
BRANCHFN(rockcol, number, br.rock_colour)
BRANCHFN(has_shops, boolean, br.has_shops)
BRANCHFN(has_uniques, boolean, br.has_uniques)
BRANCHFN(parent_branch, string,
         br.parent_branch == NUM_BRANCHES ? ""
         : branches[br.parent_branch].abbrevname)
static void push_level_id(lua_State *ls, const level_id &lid)
{
    // We're skipping the constructor; naughty, but level_id has no
    // virtual methods and no dynamically allocated memory.
    level_id *nlev =
    static_cast<level_id*>(lua_newuserdata(ls, sizeof(level_id)));
    *nlev = lid;
}
static level_id _lua_level_id(lua_State *ls, int ndx)
{
    if (lua_isstring(ls, ndx))
    {
        const char *s = lua_tostring(ls, 1);
        try
        {
            return level_id::parse_level_id(s);
        }
        catch (const std::string &err)
        {
            luaL_error(ls, err.c_str());
        }
    }
    else if (lua_isuserdata(ls, ndx))
    {
        const level_id *lid = static_cast<level_id*>(lua_touserdata(ls, ndx));
        return (*lid);
    }
    
    luaL_argerror(ls, ndx, "Expected level_id");
    // Never gets here.
    return level_id();
}
LUAFN(dgn_level_id)
{
    const int nargs = lua_gettop(ls);
    if (!nargs)
        push_level_id(ls, level_id::current());
    else if (nargs == 1)
        push_level_id(ls, _lua_level_id(ls, 1));

Deletion in crawl-ref/source/l_dgn.cc at line 1917 [9.1232]

B:BD[15.10999] → [15.10999:11120]

∅:D[15.11120] → [13.3959:3975]

B:BD[13.3959] → [13.3959:3975]

B:BD[13.3975] → [16.4606:4792]

B:BD[16.4792] → [11.12880:12885]

∅:D[11.12885] → [16.4793:4923]

B:BD[16.4793] → [16.4793:4923]

B:BD[16.4923] → [11.12886:12891]

∅:D[11.12891] → [16.4924:4975]

B:BD[16.4924] → [16.4924:4975]

B:BD[16.4975] → [11.12892:12897]

∅:D[11.12897] → [17.5567:5748]

B:BD[17.5567] → [17.5567:5748]

B:BD[17.5748] → [11.12898:12935]

∅:D[11.12935] → [17.5789:5814]

B:BD[17.5789] → [17.5789:5814]

B:BD[17.5814] → [11.12936:12941]

∅:D[11.12941] → [17.5815:5919]

B:BD[16.4976] → [17.5815:5919]

B:BD[17.5919] → [11.12942:12981]

∅:D[18.3549] → [17.5965:5990]

∅:D[11.12981] → [17.5965:5990]

B:BD[17.5965] → [17.5965:5990]

B:BD[17.5990] → [11.12982:12987]

∅:D[11.12987] → [17.5991:6049]

B:BD[17.5991] → [17.5991:6049]

B:BD[17.6049] → [11.12988:12993]

∅:D[17.6050] → [16.4976:4991]

∅:D[11.12993] → [16.4976:4991]

B:BD[16.4976] → [16.4976:4991]

}
LUAFN(dgn_level_name)
{
    const level_id lid(_lua_level_id(ls, 1));
    lua_pushstring(ls, lid.describe().c_str());
    return (1);
}
LUAFN(dgn_set_level_type_name)
{
    if (you.level_type != LEVEL_PORTAL_VAULT)
    {
        luaL_error(ls, "Can only set level type name on portal vaults");
        return(0);
    }
    
    if (!lua_isstring(ls, 1))
    {
        luaL_argerror(ls, 1, "Expected string for level type name");
        return(0);
    }
    
    you.level_type_name = luaL_checkstring(ls, 1);
    
    return(0);
}
LUAFN(dgn_set_level_type_name_abbrev)
{
    if (you.level_type != LEVEL_PORTAL_VAULT)
    {
        luaL_error(ls, "Can only set level type name abbreviation on "
                   "portal vaults");
        return(0);
    }
    
    if (!lua_isstring(ls, 1))
    {
        luaL_argerror(ls, 1, "Expected string for level type name "
                      "abbreviation");
        return(0);
    }
    
    you.level_type_name_abbrev = luaL_checkstring(ls, 1);
    
    return(0);

Deletion in crawl-ref/source/l_dgn.cc at line 1919 [9.1232]

B:BD[19.3872] → [19.3872:4059]

B:BD[19.4059] → [11.12994:12999]

∅:D[11.12999] → [19.4060:4192]

B:BD[19.4060] → [19.4060:4192]

B:BD[19.4192] → [11.13000:13005]

∅:D[11.13005] → [19.4193:4246]

B:BD[19.4193] → [19.4193:4246]

B:BD[19.4246] → [11.13006:13011]

∅:D[11.13011] → [19.4247:4262]

B:BD[19.4247] → [19.4247:4262]

∅:D[19.4262] → [13.3975:3978]

B:BD[13.3975] → [13.3975:3978]

LUAFN(dgn_set_level_type_origin)
{
    if (you.level_type != LEVEL_PORTAL_VAULT)
    {
        luaL_error(ls, "Can only set level type origin on portal vaults");
        return(0);
    }
    
    if (!lua_isstring(ls, 1))
    {
        luaL_argerror(ls, 1, "Expected string for level type origin");
        return(0);
    }
    
    you.level_type_origin = luaL_checkstring(ls, 1);
    
    return(0);
}

Replacement in crawl-ref/source/l_dgn.cc at line 1940 [9.1232]
B:BD[13.4630] → [13.4630:4677]
```
    const level_id lid = _lua_level_id(ls, 1);
```
[13.4630]
[13.4677]
```
    const level_id lid = dlua_level_id(ls, 1);
```
Replacement in crawl-ref/source/l_dgn.cc at line 1947 [9.1232]
B:BD[13.4817] → [13.4817:4864]
```
    const level_id lid = _lua_level_id(ls, 1);
```
[13.4817]
[2.3983]
```
    const level_id lid = dlua_level_id(ls, 1);
```
Replacement in crawl-ref/source/l_dgn.cc at line 1950 [9.1232]
∅:D[2.4096] → [13.4976:4978]
∅:D[20.8941] → [13.4976:4978]
B:BD[13.4976] → [13.4976:4978]
```
}
```
[2.4096]
[13.4978]
```
}          
```

Deletion in crawl-ref/source/l_dgn.cc at line 2202 [9.1232]

∅:D[11.17705] → [21.6218:6219]

B:BD[21.6218] → [21.6218:6219]

B:BD[21.6219] → [11.17706:17902]


{ "br_floorcol", dgn_br_floorcol },
{ "br_rockcol", dgn_br_rockcol },
{ "br_has_shops", dgn_br_has_shops },
{ "br_has_uniques", dgn_br_has_uniques },
{ "br_parent_branch", dgn_br_parent_branch },

Deletion in crawl-ref/source/l_dgn.cc at line 2203 [9.1232]

B:BD[21.6327] → [11.17903:18141]

{ "level_id", dgn_level_id },
{ "level_name", dgn_level_name },
{ "set_level_type_name", dgn_set_level_type_name },
{ "set_level_type_name_abbrev", dgn_set_level_type_name_abbrev },
{ "set_level_type_origin", dgn_set_level_type_origin },

Insertion in crawl-ref/source/dlua.cc at line 312 [11.19392]
[4.12304]
[4.12304]
```
    luaL_openlib(dlua, "dgn", dgn_level_lib, 0);
```

Split level and branch functions out of l_dgn.cc.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/makefile.obj at line 45 [5.79]

Insertion in crawl-ref/source/l_libs.h at line 19 [6.2907]

Insertion in crawl-ref/source/l_libs.h at line 78 [6.2907]

File addition: l_dgnlvl.cc (----------)

Deletion in crawl-ref/source/l_dgn.cc at line 1916 [9.1232]

Deletion in crawl-ref/source/l_dgn.cc at line 1917 [9.1232]

Deletion in crawl-ref/source/l_dgn.cc at line 1919 [9.1232]

Replacement in crawl-ref/source/l_dgn.cc at line 1940 [9.1232]

Replacement in crawl-ref/source/l_dgn.cc at line 1947 [9.1232]

Replacement in crawl-ref/source/l_dgn.cc at line 1950 [9.1232]

Deletion in crawl-ref/source/l_dgn.cc at line 2202 [9.1232]

Deletion in crawl-ref/source/l_dgn.cc at line 2203 [9.1232]

Insertion in crawl-ref/source/dlua.cc at line 312 [11.19392]