0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed location_set().of_pairs() syntax to follow conventions.

Browse source
This commit is contained in:
jleldridge 2013-05-16 15:52:34 -04:00
parent 04f7993ed5
commit 4e6ecc81ce
1 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
data/lua/location_set.lua
View file

@ -109,29 +109,25 @@ function methods:of_pairs(t)
for i,v in ipairs(t) do
local value_table = {}
if (v.x) and (v.y) then
for k,val in pairs(v) do
if (k ~= "x") and (k ~= "y") then
value_table[k] = val
end
end
if (next(value_table) ~= nil) then
values[index(v.x, v.y)] = value_table
else
values[index(v.x, v.y)] = true
end
local x_index
local y_index
if v.x and v.y then
x_index = "x"
y_index = "y"
else
for k,val in pairs(v) do
if (k ~= 1) and (k ~= 2) then
value_table[k] = val
end
end
if (next(value_table) ~= nil) then
values[index(v[1], v[2])] = value_table
else
values[index(v[1], v[2])] = true
x_index = 1
y_index = 2
end
for k,val in pairs(v) do
if k ~= x_index and k ~= y_index then
value_table[k] = val
end
end
if next(value_table) then
values[index(v[x_index], v[y_index])] = value_table
else
values[index(v[x_index], v[y_index])] = true
end
end
end