nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

be more consistent with coordinates

Browse Source
This commit is contained in:
nhmall
2022-07-02 09:10:03 -04:00
parent 0bd5b3d39e
commit 3004cf2d34
74 changed files with 831 additions and 746 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/nhlua.c
View File

@@ -380,12 +380,15 @@ splev_typ2chr(schar typ)
static int
nhl_gettrap(lua_State *L)
{
int x, y;
lua_Integer lx, ly;
coordxy x, y;
if (!nhl_get_xy_params(L, &x, &y)) {
if (!nhl_get_xy_params(L, &lx, &ly)) {
nhl_error(L, "Incorrect arguments");
return 0;
}
x = (coordxy) lx;
y = (coordxy) ly;
if (isok(x, y)) {
struct trap *ttmp = t_at(x,y);
@@ -427,13 +430,16 @@ nhl_gettrap(lua_State *L)
static int
nhl_deltrap(lua_State *L)
{
int x, y;
lua_Integer lx, ly;
coordxy x, y;
if (!nhl_get_xy_params(L, &x, &y)) {
if (!nhl_get_xy_params(L, &lx, &ly)) {
nhl_error(L, "Incorrect arguments");
return 0;
}
x = (coordxy) lx;
y = (coordxy) ly;
if (isok(x, y)) {
struct trap *ttmp = t_at(x,y);
@@ -448,21 +454,21 @@ nhl_deltrap(lua_State *L)
return TRUE if there are such params in the stack.
*/
boolean
nhl_get_xy_params(lua_State *L, int *x, int *y)
nhl_get_xy_params(lua_State *L, lua_Integer *x, lua_Integer *y)
{
int argc = lua_gettop(L);
boolean ret = FALSE;
if (argc == 2) {
*x = (int) lua_tointeger(L, 1);
*y = (int) lua_tointeger(L, 2);
*x = lua_tointeger(L, 1);
*y = lua_tointeger(L, 2);
ret = TRUE;
} else if (argc == 1 && lua_type(L, 1) == LUA_TTABLE) {
lua_Integer ax, ay;
ret = get_coord(L, 1, &ax, &ay);
*x = (int) ax;
*y = (int) ay;
*x = ax;
*y = ay;
}
return ret;
}
@@ -474,13 +480,17 @@ DISABLE_WARNING_UNREACHABLE_CODE
static int
nhl_getmap(lua_State *L)
{
int x, y;
lua_Integer lx, ly;
coordxy x, y;
if (!nhl_get_xy_params(L, &x, &y)) {
if (!nhl_get_xy_params(L, &lx, &ly)) {
nhl_error(L, "Incorrect arguments");
return 0;
}
x = (coordxy) lx;
y = (coordxy) ly;
if (isok(x, y)) {
char buf[BUFSZ];
lua_newtable(L);
@@ -1038,7 +1048,7 @@ nhl_stairways(lua_State *L)
static int
nhl_test(lua_State *L)
{
int x, y;
coordxy x, y;
char *name, Player[] = "Player";
/* discard any extra arguments passed in */
@@ -1046,11 +1056,11 @@ nhl_test(lua_State *L)
luaL_checktype(L, 1, LUA_TTABLE);
x = get_table_int(L, "x");
y = get_table_int(L, "y");
x = (coordxy) get_table_int(L, "x");
y = (coordxy) get_table_int(L, "y");
name = get_table_str_opt(L, "name", Player);
pline("TEST:{ x=%i, y=%i, name=\"%s\" }", x,y, name);
pline("TEST:{ x=%i, y=%i, name=\"%s\" }", (int) x, (int) y, name);
free(name);
@@ -1141,15 +1151,19 @@ nhl_timer_has_at(lua_State *L)
{
boolean ret = FALSE;
short timertype = nhl_get_timertype(L, -1);
int x, y;
lua_Integer lx, ly;
coordxy x, y;
long when;
lua_pop(L, 1); /* remove timertype */
if (!nhl_get_xy_params(L, &x, &y)) {
if (!nhl_get_xy_params(L, &lx, &ly)) {
nhl_error(L, "nhl_timer_has_at: Wrong args");
return 0;
}
x = (coordxy) lx;
y = (coordxy) ly;
if (isok(x, y)) {
when = spot_time_expires(x, y, timertype);
ret = (when > 0L);
@@ -1166,14 +1180,18 @@ nhl_timer_peek_at(lua_State *L)
{
long when = 0L;
short timertype = nhl_get_timertype(L, -1);
int x, y;
lua_Integer lx, ly;
coordxy x, y;
lua_pop(L, 1); /* remove timertype */
if (!nhl_get_xy_params(L, &x, &y)) {
if (!nhl_get_xy_params(L, &lx, &ly)) {
nhl_error(L, "nhl_timer_peek_at: Wrong args");
return 0;
}
x = (coordxy) lx;
y = (coordxy) ly;
if (timer_is_pos(timertype) && isok(x, y))
when = spot_time_expires(x, y, timertype);
lua_pushinteger(L, when);
@@ -1187,14 +1205,18 @@ static int
nhl_timer_stop_at(lua_State *L)
{
short timertype = nhl_get_timertype(L, -1);
int x, y;
lua_Integer lx, ly;
coordxy x, y;
lua_pop(L, 1); /* remove timertype */
if (!nhl_get_xy_params(L, &x, &y)) {
if (!nhl_get_xy_params(L, &lx, &ly)) {
nhl_error(L, "nhl_timer_stop_at: Wrong args");
return 0;
}
x = (coordxy) lx;
y = (coordxy) ly;
if (timer_is_pos(timertype) && isok(x, y))
spot_stop_timers(x, y, timertype);
return 0;
@@ -1207,14 +1229,18 @@ nhl_timer_start_at(lua_State *L)
{
short timertype = nhl_get_timertype(L, -2);
long when = lua_tointeger(L, -1);
int x, y;
lua_Integer lx, ly;
coordxy x, y;
lua_pop(L, 2); /* remove when and timertype */
if (!nhl_get_xy_params(L, &x, &y)) {
if (!nhl_get_xy_params(L, &lx, &ly)) {
nhl_error(L, "nhl_timer_start_at: Wrong args");
return 0;
}
x = (coordxy) lx;
y = (coordxy) ly;
if (timer_is_pos(timertype) && isok(x, y)) {
long where = ((long) x << 16) | (long) y;