From: Pasi Kallinen <paxed@alt.org>
Date: Sun, 9 Feb 2020 12:47:41 +0000 (+0200)
Subject: Fix the selection param unify
X-Git-Tag: NetHack-3.7.0_WIP-2020-02-14~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=39032d2faccfc9497fd3f54bb1edaf02346a4782;p=nethack

Fix the selection param unify
---

diff --git a/src/nhlsel.c b/src/nhlsel.c
index fdca6ae5d..3a2eb84d7 100644
--- a/src/nhlsel.c
+++ b/src/nhlsel.c
@@ -13,7 +13,7 @@ static int FDECL(l_selection_setpoint, (lua_State *));
 static int FDECL(l_selection_not, (lua_State *));
 static int FDECL(l_selection_filter_percent, (lua_State *));
 static int FDECL(l_selection_rndcoord, (lua_State *));
-static boolean FDECL(params_sel_2coords, (lua_State *, struct selectionvar *,
+static boolean FDECL(params_sel_2coords, (lua_State *, struct selectionvar **,
                                           schar *, schar *, schar *, schar *));
 static int FDECL(l_selection_line, (lua_State *));
 static int FDECL(l_selection_randline, (lua_State *));
@@ -319,7 +319,7 @@ lua_State *L;
 static boolean
 params_sel_2coords(L, sel, x1,y1, x2,y2)
 lua_State *L;
-struct selectionvar *sel;
+struct selectionvar **sel;
 schar *x1, *y1, *x2, *y2;
 {
     int argc = lua_gettop(L);
@@ -330,14 +330,14 @@ schar *x1, *y1, *x2, *y2;
         *y1 = (schar) luaL_checkinteger(L, 2);
         *x2 = (schar) luaL_checkinteger(L, 3);
         *y2 = (schar) luaL_checkinteger(L, 4);
-        sel = l_selection_check(L, 5);
+        *sel = l_selection_check(L, 5);
         lua_remove(L, 1);
         lua_remove(L, 1);
         lua_remove(L, 1);
         lua_remove(L, 1);
         return TRUE;
     } else if (argc == 5) {
-        sel = l_selection_check(L, 1);
+        *sel = l_selection_check(L, 1);
         *x1 = (schar) luaL_checkinteger(L, 2);
         *y1 = (schar) luaL_checkinteger(L, 3);
         *x2 = (schar) luaL_checkinteger(L, 4);
@@ -360,7 +360,7 @@ lua_State *L;
     schar x2;
     schar y2;
 
-    if (!params_sel_2coords(L, sel, &x1, &y1, &x2, &y2)) {
+    if (!params_sel_2coords(L, &sel, &x1, &y1, &x2, &y2)) {
         nhl_error(L, "selection.line: illegal arguments");
     }
 
@@ -383,7 +383,7 @@ lua_State *L;
     schar x2;
     schar y2;
 
-    if (!params_sel_2coords(L, sel, &x1, &y1, &x2, &y2)) {
+    if (!params_sel_2coords(L, &sel, &x1, &y1, &x2, &y2)) {
         nhl_error(L, "selection.rect: illegal arguments");
     }
 
@@ -414,7 +414,7 @@ lua_State *L;
     schar x2;
     schar y2;
 
-    if (!params_sel_2coords(L, sel, &x1, &y1, &x2, &y2)) {
+    if (!params_sel_2coords(L, &sel, &x1, &y1, &x2, &y2)) {
         nhl_error(L, "selection.fillrect: illegal arguments");
     }