Lua code: replace deprecated wesnoth.get_all_vars() calls

wesnoth · May 13, 2018 · acf4269 · acf4269
1 parent 51b2dbe
commit acf4269
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/data/lua/core.lua b/data/lua/core.lua
@@ -236,11 +236,12 @@ if wesnoth.kernel_type() == "Game Lua Kernel" then
 	--[========[Basic variable access]========]
 
 	-- Get all variables via wml.all_variables (read-only)
+	local get_all_vars_local = wesnoth.get_all_vars
 	setmetatable(wml, {
 		__metatable = "WML module",
 		__index = function(self, key)
 			if key == 'all_variables' then
-				return wesnoth.get_all_vars()
+				return get_all_vars_local()
 			end
 			return rawget(self, key)
 		end,

diff --git a/data/test/scenarios/test_clear.cfg b/data/test/scenarios/test_clear.cfg
@@ -12,7 +12,7 @@
 
         [lua]
             code = << local a,b,c = false,false,false
-			  for k,v in pairs(wesnoth.get_all_vars()) do
+			  for k,v in pairs(wml.all_variables) do
 			    if k == "A" then
 			      a = true
 			    elseif (k == "B") and (v == 10) then
@@ -40,7 +40,7 @@
 
         [lua]
             code = << local a,b,c = false,false,false
-			  for k,v in pairs(wesnoth.get_all_vars()) do
+			  for k,v in pairs(wml.all_variables) do
 			    if k == "A" then
 			      a = true
 			    elseif (k == "B") and (v == 10) then