fiddlerwoaroof/crawl - Change K73AS36BODJSSKMT2LRFDKS7BAMETNFLWHZEPQEZFM6KQB6KRA4AC

Split out tiles specific functions from l_dgn.cc.

Also a little cleanup.

Created by Robert Vollmert on October 20, 2009

K73AS36BODJSSKMT2LRFDKS7BAMETNFLWHZEPQEZFM6KQB6KRA4AC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/makefile.obj at line 46 [3.79]
[2.2856]
[2.2856]
```
l_dgntil.o \
```
Insertion in crawl-ref/source/l_libs.h at line 10 [4.2907]
[4.2926]
[4.2926]
```
/*
 * Libraries and loaders, accessed from init_dungeon_lua().
 */
```
Insertion in crawl-ref/source/l_libs.h at line 20 [4.2907]
[2.3024]
[4.3009]
```
extern const struct luaL_reg dgn_tile_lib[];
```

Replacement in crawl-ref/source/l_libs.h at line 34 [4.2907]

B:BD[4.3174] → [2.3104:3111]

#endif

[4.3174]

[2.3111]

/*
 * Macros for processing object arguments.
 */
#define GETCOORD(c, p1, p2, boundfn)                      \
    coord_def c;                                          \
    c.x = luaL_checkint(ls, p1);                          \
    c.y = luaL_checkint(ls, p2);                          \
    if (!boundfn(c))                                        \
        luaL_error(                                             \
            ls,                                                 \
            make_stringf("Point (%d,%d) is out of bounds",      \
                         c.x, c.y).c_str());                    \
    else ;
#define COORDS(c, p1, p2)                                \
    GETCOORD(c, p1, p2, in_bounds)
#define LEVEL(lev, br, pos)                                             \
const char *level_name = luaL_checkstring(ls, pos);                 \
level_area_type lev = str_to_level_area_type(level_name);           \
if (lev == NUM_LEVEL_AREA_TYPES)                                    \
luaL_error(ls, "Expected level name");                          \
const char *branch_name = luaL_checkstring(ls, pos);                \
branch_type br = str_to_branch(branch_name);                        \
if (lev == LEVEL_DUNGEON && br == NUM_BRANCHES)                     \
luaL_error(ls, "Expected branch name");

Insertion in crawl-ref/source/l_libs.h at line 62 [4.2907]

[2.3112]

#define MAP(ls, n, var)                             \
map_def *var = *(map_def **) luaL_checkudata(ls, n, MAP_METATABLE)
#define DEVENT(ls, n, var) \
dgn_event *var = *(dgn_event **) luaL_checkudata(ls, n, DEVENT_METATABLE)
#define MAPMARKER(ls, n, var) \
map_marker *var = *(map_marker **) luaL_checkudata(ls, n, MAPMARK_METATABLE)
/*
 * Some shared helper functions.
 */
class map_lines;
int dgn_map_add_transform(lua_State *ls,
          std::string (map_lines::*add)(const std::string &s));
unsigned int get_tile_idx(lua_State *ls, int arg);
#endif

Replacement in crawl-ref/source/l_dgn.cc at line 366 [5.1232]

B:BD[5.7432] → [6.7915:7949]

B:BD[6.7949] → [7.5380:5514]

static int dgn_map_add_transform(
                                 lua_State *ls,
                                 std::string (map_lines::*add)(const std::string &s))

[5.7432]

[5.7470]

int dgn_map_add_transform(lua_State *ls,
                          std::string (map_lines::*add)(const std::string &s))

Deletion in crawl-ref/source/l_dgn.cc at line 1179 [5.1232]

B:BD[8.5452] → [8.5452:5454]

B:BD[8.5454] → [9.91584:91788]

B:BD[9.91788] → [7.10306:10311]

∅:D[7.10311] → [9.91789:91844]

B:BD[9.91789] → [9.91789:91844]

B:BD[9.91844] → [7.10312:10317]

∅:D[7.10317] → [9.91845:92088]

B:BD[8.5455] → [9.91845:92088]

B:BD[9.92088] → [7.10318:10323]

∅:D[7.10323] → [9.92089:92105]

B:BD[9.92089] → [9.92089:92105]

}
#ifdef USE_TILE
static unsigned int _get_tile_idx(lua_State *ls, int arg)
{
    if (!lua_isstring(ls, arg))
    {
        luaL_argerror(ls, arg, "Expected string for tile name");
        return 0;
    }
    
    const char *tile_name = luaL_checkstring(ls, arg);
    
    unsigned int idx;
    if (!tile_dngn_index(tile_name, idx))
    {
        std::string error = "Couldn't find tile '";
        error += tile_name;
        error += "'";
        luaL_argerror(ls, arg, error.c_str());
        return 0;
    }
    
    return idx;

Deletion in crawl-ref/source/l_dgn.cc at line 1180 [5.1232]
B:BD[9.92107] → [9.92107:92114]
```
#endif
```
Replacement in crawl-ref/source/l_dgn.cc at line 1238 [5.1232]
B:BD[9.92227] → [9.92227:92273]
```
    unsigned int tile = _get_tile_idx(ls, 3);
```
[9.92227]
[9.92273]
```
    unsigned int tile = get_tile_idx(ls, 3);
```

Deletion in crawl-ref/source/l_dgn.cc at line 1939 [5.1232]

B:BD[10.7944] → [9.92680:92755]

B:BD[9.92755] → [7.12279:12805]


#define LEVEL(lev, br, pos)                                             \
const char *level_name = luaL_checkstring(ls, pos);                 \
level_area_type lev = str_to_level_area_type(level_name);           \
if (lev == NUM_LEVEL_AREA_TYPES)                                    \
luaL_error(ls, "Expected level name");                          \
const char *branch_name = luaL_checkstring(ls, pos);                \
branch_type br = str_to_branch(branch_name);                        \
if (lev == LEVEL_DUNGEON && br == NUM_BRANCHES)                     \
luaL_error(ls, "Expected branch name");

Deletion in crawl-ref/source/l_dgn.cc at line 2208 [5.1232]

B:BD[11.4965] → [11.4965:4968]

B:BD[11.4968] → [9.93322:93388]

B:BD[9.93388] → [7.13588:13593]

∅:D[7.13593] → [9.93389:93447]

B:BD[9.93389] → [9.93389:93447]

B:BD[9.93447] → [7.13594:13599]

∅:D[7.13599] → [9.93448:93648]

B:BD[9.93448] → [9.93448:93648]

B:BD[9.93648] → [7.13600:13605]

∅:D[7.13605] → [9.93649:93707]

B:BD[9.93649] → [9.93649:93707]

B:BD[9.93707] → [7.13606:13611]

∅:D[7.13611] → [9.93708:93839]

B:BD[9.93708] → [9.93708:93839]

}
LUAFN(dgn_lev_floortile)
{
#ifdef USE_TILE
    LEVEL(lev, br, 1);
    
    tile_flavour flv;
    tile_default_flv(lev, br, flv);
    
    const char *tile_name = tile_dngn_name(flv.floor);
    PLUARET(string, tile_name);
#else
    PLUARET(string, "invalid");
#endif
}
LUAFN(dgn_lev_rocktile)
{
#ifdef USE_TILE
    LEVEL(lev, br, 1);
    
    tile_flavour flv;
    tile_default_flv(lev, br, flv);
    
    const char *tile_name = tile_dngn_name(flv.wall);
    PLUARET(string, tile_name);
#else
    PLUARET(string, "invalid");
#endif

Deletion in crawl-ref/source/l_dgn.cc at line 2210 [5.1232]

B:BD[9.93842] → [12.92321:92342]

∅:D[12.92342] → [9.93862:93885]

B:BD[9.93862] → [9.93862:93885]

B:BD[9.93885] → [7.13612:13617]

∅:D[7.13617] → [9.93886:93977]

B:BD[9.93886] → [9.93886:93977]

B:BD[9.93977] → [7.13618:13623]

∅:D[7.13623] → [9.93978:94125]

B:BD[9.93978] → [9.93978:94125]

B:BD[9.94125] → [12.92343:92365]

∅:D[12.92365] → [9.94146:94169]

B:BD[9.94146] → [9.94146:94169]

B:BD[9.94169] → [7.13624:13629]

∅:D[7.13629] → [9.94170:94262]

B:BD[9.94170] → [9.94170:94262]

B:BD[9.94262] → [7.13630:13635]

∅:D[7.13635] → [9.94263:94556]

B:BD[9.94263] → [9.94263:94556]

B:BD[9.94556] → [7.13636:13641]

∅:D[7.13641] → [9.94557:94716]

B:BD[9.94557] → [9.94557:94716]

∅:D[9.94716] → [13.4773:4775]

B:BD[13.4773] → [13.4773:4775]

B:BD[13.4775] → [9.94717:94834]

B:BD[9.94834] → [7.13642:13647]

∅:D[7.13647] → [9.94835:94955]

B:BD[9.94835] → [9.94835:94955]

B:BD[9.94955] → [12.92366:92411]

B:BD[12.92411] → [6.9064:9129]

∅:D[6.9129] → [12.92572:92637]

B:BD[12.92572] → [12.92572:92637]

B:BD[12.92637] → [6.9130:9194]

∅:D[6.9194] → [12.92796:92816]

B:BD[12.92796] → [12.92796:92816]

∅:D[12.92816] → [9.94955:94965]

B:BD[9.94955] → [9.94955:94965]

LUAFN(dgn_lrocktile)
{
    MAP(ls, 1, map);
    
#ifdef USE_TILE
    unsigned short tile = _get_tile_idx(ls, 2);
    map->rock_tile = tile;
    
    const char *tile_name = tile_dngn_name(tile);
    PLUARET(string, tile_name);
#else
    UNUSED(map);
    PLUARET(string, "invalid");
#endif
}
LUAFN(dgn_lfloortile)
{
    MAP(ls, 1, map);
    
#ifdef USE_TILE
    unsigned short tile = _get_tile_idx(ls, 2);
    map->floor_tile = tile;
    
    const char *tile_name = tile_dngn_name(tile);
    PLUARET(string, tile_name);
#else
    UNUSED(map);
    PLUARET(string, "invalid");
#endif
}
LUAFN(dgn_change_rock_tile)
{
#ifdef USE_TILE
    unsigned short tile = _get_tile_idx(ls, 1);
    if (tile)
        env.tile_default.wall = tile;
    
    const char *tile_name = tile_dngn_name(tile);
    PLUARET(string, tile_name);
#else
    PLUARET(string, "invalid");
#endif
}
LUAFN(dgn_change_floor_tile)
{
#ifdef USE_TILE
    unsigned short tile = _get_tile_idx(ls, 1);
    if (tile)
        env.tile_default.floor = tile;
    
    const char *tile_name = tile_dngn_name(tile);
    PLUARET(string, tile_name);
#else
    PLUARET(string, "invalid");
#endif
}
LUAFN(dgn_ftile)
{
#ifdef USE_TILE
    return dgn_map_add_transform(ls, &map_lines::add_floortile);
#else
    return 0;
#endif
}
LUAFN(dgn_rtile)
{
#ifdef USE_TILE
    return dgn_map_add_transform(ls, &map_lines::add_rocktile);
#else
    return 0;
#endif
}

Deletion in crawl-ref/source/l_dgn.cc at line 2357 [5.1232]

B:BD[6.9330] → [7.18491:18777]

∅:D[7.18777] → [6.9330:9331]

B:BD[6.9330] → [6.9330:9331]

{ "lrocktile", dgn_lrocktile },
{ "lfloortile", dgn_lfloortile },
{ "rtile", dgn_rtile },
{ "ftile", dgn_ftile },
{ "change_rock_tile", dgn_change_rock_tile },
{ "change_floor_tile", dgn_change_floor_tile },
{ "lev_floortile", dgn_lev_floortile },
{ "lev_rocktile", dgn_lev_rocktile },

Deletion in crawl-ref/source/dlua.h at line 98 [5.228]
B:BD[14.3177] → [15.3082:3083]

Deletion in crawl-ref/source/dlua.h at line 105 [5.228]

B:BD[15.3299] → [15.3299:3877]


#define GETCOORD(c, p1, p2, boundfn)                      \
    coord_def c;                                          \
    c.x = luaL_checkint(ls, p1);                          \
    c.y = luaL_checkint(ls, p2);                          \
    if (!boundfn(c))                                        \
        luaL_error(                                             \
            ls,                                                 \
            make_stringf("Point (%d,%d) is out of bounds",      \
                         c.x, c.y).c_str());                    \
    else ;

Deletion in crawl-ref/source/dlua.h at line 106 [5.228]

B:BD[15.3878] → [15.3878:3974]

B:BD[15.3974] → [7.18930:19263]

B:BD[7.19389] → [7.19389:19390]


#define COORDS(c, p1, p2)                                \
    GETCOORD(c, p1, p2, in_bounds)
#define MAP(ls, n, var)                             \
map_def *var = *(map_def **) luaL_checkudata(ls, n, MAP_METATABLE)
#define DEVENT(ls, n, var) \
dgn_event *var = *(dgn_event **) luaL_checkudata(ls, n, DEVENT_METATABLE)
#define MAPMARKER(ls, n, var) \
map_marker *var = *(map_marker **) luaL_checkudata(ls, n, MAPMARK_METATABLE)

Insertion in crawl-ref/source/dlua.cc at line 313 [7.19392]
[2.12352]
[7.42078]
```
    luaL_openlib(dlua, "dgn", dgn_tile_lib, 0);
```

Split out tiles specific functions from l_dgn.cc.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/makefile.obj at line 46 [3.79]

Insertion in crawl-ref/source/l_libs.h at line 10 [4.2907]

Insertion in crawl-ref/source/l_libs.h at line 20 [4.2907]