fiddlerwoaroof/crawl - Change OIWB7TPX3LFYDGSVPUUVUGWTY7JB4PE6EBELDFZX7B3HIOWH25GQC

Move grd_lib out of clua.cc into l_mapgrd.cc.

Rest of commit comment only as accurate as my understanding…

Renaming from grd to mapgrd to avoid confusion with grd == env.grid: This grd is the maplines-section of a vault definition.

Also move mapgrd_lib from clua to dlua since it's only used for dungeon building.

clua and dlua need more descriptive names.

Created by Robert Vollmert on October 20, 2009

OIWB7TPX3LFYDGSVPUUVUGWTY7JB4PE6EBELDFZX7B3HIOWH25GQC

Dependencies

In channels

main

Change contents

Insertion in crawl-ref/source/makefile.obj at line 54 [6.79]
[4.3032]
[5.2830]
```
l_mapgrd.o \
```

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

[7.24]

#include "AppHdr.h"
#include "dlua.h"
#include "l_libs.h"
#include "mapdef.h"
/////////////////////////////////////////////////////////////////////
// grd and grd_col handling (i.e. map_lines in a metatable)
struct mapcolumn
{
    map_def* map;
    int col;
};
static int grd_get(lua_State *ls)
{
    // Return a metatable for this column in the map grid.
    map_def *map = *(map_def **) luaL_checkudata(ls, 1, MAPGRD_METATABLE);
    int column = luaL_checkint(ls, 2);
    mapcolumn *mapref = clua_new_userdata<mapcolumn>(ls, MAPGRD_COL_METATABLE);
    mapref->map = map;
    mapref->col = column;
    return (1);
}
static int grd_set(lua_State *ls)
{
    return (luaL_error(ls, "%s", "Cannot assign to read-only table."));
}
static char* grd_glyph(lua_State *ls, int &col, int &row)
{
    mapcolumn *mapc = (mapcolumn *)luaL_checkudata(ls, 1, MAPGRD_COL_METATABLE);
    row = luaL_checkint(ls, 2);
    col = mapc->col;
    map_lines &lines = mapc->map->map;
    if (row < 1 || col < 1 || col > lines.width() || row > lines.height())
    {
        return (NULL);
    }
    coord_def mc(col - 1, row - 1);
    return (&lines(mc));
}
static int grd_col_get(lua_State *ls)
{
    int col, row;
    char *gly = grd_glyph(ls, col, row);
    if (!gly)
        return (luaL_error(ls, "Invalid coords: %d, %d", col, row));
    char buf[2];
    buf[0] = *gly;
    buf[1] = '\0';
    
    lua_pushstring(ls, buf); 
    return (1);
}
static int grd_col_set(lua_State *ls)
{
    int col, row;
    char *gly = grd_glyph(ls, col, row);
    if (!gly)
        return (luaL_error(ls, "Invalid coords: %d, %d", col, row));
    const char *str = luaL_checkstring(ls, 3);
    if (!str[0] || str[1])
        return (luaL_error(ls, "%s", "grd must be set to a single char."));
    (*gly) = str[0];
    return (0);
}
void dluaopen_mapgrd(lua_State *ls)
{
    // grd table
    luaL_newmetatable(ls, MAPGRD_METATABLE);
    lua_pushstring(ls, "__index");
    lua_pushcfunction(ls, grd_get);
    lua_settable(ls, -3);
    lua_pushstring(ls, "__newindex");
    lua_pushcfunction(ls, grd_set);
    lua_settable(ls, -3);
    lua_pop(ls, 1);
    // grd col table    
    luaL_newmetatable(ls, MAPGRD_COL_METATABLE);
    lua_pushstring(ls, "__index");
    lua_pushcfunction(ls, grd_col_get);
    lua_settable(ls, -3);
    lua_pushstring(ls, "__newindex");
    lua_pushcfunction(ls, grd_col_set);
    lua_settable(ls, -3);
    lua_pop(ls, 1);
}

Deletion in crawl-ref/source/l_libs.h at line 17 [9.2907]
∅:D[3.10713] → [8.3235:3236]
B:BD[8.3235] → [8.3235:3236]

Replacement in crawl-ref/source/l_libs.h at line 44 [9.2907]

B:BD[8.3859] → [2.2983:3021]

void dluaopen_you(lua_State *ls);

[8.3859]

[10.2988]

void dluaopen_mapgrd(lua_State *ls);
void dluaopen_you(lua_State *ls);

Replacement in crawl-ref/source/l_dgnbld.cc at line 20 [11.2992]

B:BD[11.3303] → [11.3303:3375]

    map_def **mapref = clua_new_userdata<map_def *>(ls, GRD_METATABLE);

[11.3303]

[11.3375]

    map_def **mapref = clua_new_userdata<map_def *>(ls, MAPGRD_METATABLE);

Insertion in crawl-ref/source/dlua.cc at line 310 [12.19392]
[8.19428]
[2.3074]
```
    dluaopen_mapgrd(dlua);
```

Replacement in crawl-ref/source/clua.h at line 323 [15.481234]

B:BD[13.35902] → [14.17641:17712]

#define GRD_METATABLE "dgn.grd"
#define GRD_COL_METATABLE "dgn.grdcol"

[13.35902]

[16.19434]

#define MAPGRD_METATABLE "dgn.mapgrd"
#define MAPGRD_COL_METATABLE "dgn.mapgrdcol"

Deletion in crawl-ref/source/clua.cc at line 599 [15.483969]
B:BD[16.20212] → [14.17714:17747]
```
void luaopen_grd(lua_State *ls);
```
Deletion in crawl-ref/source/clua.cc at line 628 [15.483969]
B:BD[16.20466] → [14.17748:17773]
```
    luaopen_grd(_state);
```

Deletion in crawl-ref/source/clua.cc at line 1998 [15.483969]

B:BD[15.535301] → [14.17774:17959]


/////////////////////////////////////////////////////////////////////
// grd and grd_col handling (i.e. map_lines in a metatable)
struct mapcolumn
{
    map_def* map;
    int col;
};

Deletion in crawl-ref/source/clua.cc at line 1999 [15.483969]

B:BD[15.535302] → [14.17960:20113]

static int grd_get(lua_State *ls)
{
    // Return a metatable for this column in the map grid.
    map_def *map = *(map_def **) luaL_checkudata(ls, 1, GRD_METATABLE);
    int column = luaL_checkint(ls, 2);
    mapcolumn *mapref = clua_new_userdata<mapcolumn>(ls, GRD_COL_METATABLE);
    mapref->map = map;
    mapref->col = column;
    return (1);
}
static int grd_set(lua_State *ls)
{
    return (luaL_error(ls, "%s", "Cannot assign to read-only table."));
}
static char* grd_glyph(lua_State *ls, int &col, int &row)
{
    mapcolumn *mapc = (mapcolumn *)luaL_checkudata(ls, 1, GRD_COL_METATABLE);
    row = luaL_checkint(ls, 2);
    col = mapc->col;
    map_lines &lines = mapc->map->map;
    if (row < 1 || col < 1 || col > lines.width() || row > lines.height())
    {
        return (NULL);
    }
    coord_def mc(col - 1, row - 1);
    return (&lines(mc));
}
static int grd_col_get(lua_State *ls)
{
    int col, row;
    char *gly = grd_glyph(ls, col, row);
    if (!gly)
        return (luaL_error(ls, "Invalid coords: %d, %d", col, row));
    char buf[2];
    buf[0] = *gly;
    buf[1] = '\0';
    
    lua_pushstring(ls, buf); 
    return (1);
}
static int grd_col_set(lua_State *ls)
{
    int col, row;
    char *gly = grd_glyph(ls, col, row);
    if (!gly)
        return (luaL_error(ls, "Invalid coords: %d, %d", col, row));
    const char *str = luaL_checkstring(ls, 3);
    if (!str[0] || str[1])
        return (luaL_error(ls, "%s", "grd must be set to a single char."));
    (*gly) = str[0];
    return (0);
}
void luaopen_grd(lua_State *ls)
{
    // grd table
    luaL_newmetatable(ls, GRD_METATABLE);
    lua_pushstring(ls, "__index");
    lua_pushcfunction(ls, grd_get);
    lua_settable(ls, -3);
    lua_pushstring(ls, "__newindex");
    lua_pushcfunction(ls, grd_set);
    lua_settable(ls, -3);
    lua_pop(ls, 1);
    // grd col table    
    luaL_newmetatable(ls, GRD_COL_METATABLE);
    lua_pushstring(ls, "__index");
    lua_pushcfunction(ls, grd_col_get);
    lua_settable(ls, -3);
    lua_pushstring(ls, "__newindex");
    lua_pushcfunction(ls, grd_col_set);
    lua_settable(ls, -3);
    lua_pop(ls, 1);
}

Move grd_lib out of clua.cc into l_mapgrd.cc.

Dependencies

In channels

Change contents

Insertion in crawl-ref/source/makefile.obj at line 54 [6.79]

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

Deletion in crawl-ref/source/l_libs.h at line 17 [9.2907]

Replacement in crawl-ref/source/l_libs.h at line 44 [9.2907]

Replacement in crawl-ref/source/l_dgnbld.cc at line 20 [11.2992]

Insertion in crawl-ref/source/dlua.cc at line 310 [12.19392]

Replacement in crawl-ref/source/clua.h at line 323 [15.481234]

Deletion in crawl-ref/source/clua.cc at line 599 [15.483969]

Deletion in crawl-ref/source/clua.cc at line 628 [15.483969]

Deletion in crawl-ref/source/clua.cc at line 1998 [15.483969]

Deletion in crawl-ref/source/clua.cc at line 1999 [15.483969]