Lua: Fix DisplayVariable (dkfans#4812)

Author: PieterVdc

src/lua_api.c

@@ -858,13 +858,18 @@ static int lua_Display_countdown(lua_State *L)
 static int lua_Display_variable(lua_State *L)
 {
     PlayerNumber player   = luaL_checkPlayerSingle(L, 1);
-    int variable = luaL_checkinteger(L,2);
-    int target = luaL_checkinteger(L,3);
+    int32_t varib_id, varib_type;
+    luaL_checkVariable(L, 2, &varib_id, &varib_type);
+    int target = luaL_optinteger(L,3,0);
+    unsigned char target_type = luaL_optinteger(L,4,0);
 
     game.script_variable_player = player;
-    game.script_value_type = variable;
-    game.script_value_id = target;
+    game.script_value_type = varib_type;
+    game.script_value_id = varib_id;
+    game.script_variable_target = target;
+    game.script_variable_target_type = target_type;
     game.flags_gui |= GGUI_Variable;
+
     return 0;
 }
 

src/lua_params.c

@@ -544,6 +544,15 @@ long luaL_checkAnimationId(lua_State* L, int index)
     return 0;
 }
 
+void luaL_checkVariable(lua_State* L, int index, int32_t* varib_id, int32_t* varib_type)
+{
+    const char* variable = luaL_checkstring(L, index);
+    if (!parse_get_varib(variable, varib_id, varib_type, 1))
+    {
+        luaL_argerror(L, index, lua_pushfstring(L, "Unknown variable, '%s'", variable));
+    }
+}
+
 /***************************************************************************************************/
 /************    Outputs   *************************************************************************/
 /***************************************************************************************************/

src/lua_params.h

@@ -65,6 +65,7 @@ struct Thing *luaL_checkCreature(lua_State *L, int index);
 struct Thing* luaL_checkObject(lua_State* L, int index);
 void luaL_checkCoord3d(lua_State *L, int index, struct Coord3d* pos);
 long luaL_checkAnimationId(lua_State* L, int index);
+void luaL_checkVariable(lua_State* L, int index, int32_t* varib_id, int32_t* varib_type);
 
 /****   Outputs  *******/
 void lua_pushThing(lua_State *L, struct Thing* thing);