Skip to content

Commit

Permalink
framework udpate
Browse files Browse the repository at this point in the history
  • Loading branch information
Tercioo committed Mar 10, 2022
1 parent ade373f commit ecf1b3b
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 18 deletions.
27 changes: 11 additions & 16 deletions Libs/DF/fw.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@


local dversion = 291
local dversion = 292
local major, minor = "DetailsFramework-1.0", dversion
local DF, oldminor = LibStub:NewLibrary (major, minor)

Expand Down Expand Up @@ -340,33 +340,28 @@ function DF.table.reverse (t)
end

--> copy from table2 to table1 overwriting values
function DF.table.copy (t1, t2)
for key, value in pairs (t2) do
if (key ~= "__index") then
function DF.table.copy(t1, t2)
for key, value in pairs(t2) do
if (key ~= "__index" and key ~= "__newindex") then
if (type (value) == "table") then

--if (SAVINGDATA) then
-- tinsert (_detalhes_global.exit_log, "copy loop key: " .. key)
--end

t1 [key] = t1 [key] or {}
DF.table.copy (t1 [key], t2 [key])
t1[key] = t1[key] or {}
DF.table.copy(t1[key], t2[key])
else
t1 [key] = value
t1[key] = value
end
end
end
return t1
end

--> copy from table2 to table1 overwriting values but do not copy data that cannot be compressed
function DF.table.copytocompress (t1, t2)
for key, value in pairs (t2) do
function DF.table.copytocompress(t1, t2)
for key, value in pairs(t2) do
if (key ~= "__index" and type(value) ~= "function") then
if (type(value) == "table") then
if (not value.GetObjectType) then
t1 [key] = t1 [key] or {}
DF.table.copytocompress(t1 [key], t2 [key])
t1[key] = t1[key] or {}
DF.table.copytocompress(t1[key], t2[key])
end
else
t1 [key] = value
Expand Down
4 changes: 2 additions & 2 deletions boot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

local version, build, date, tocversion = GetBuildInfo()

_detalhes.build_counter = 9718
_detalhes.alpha_build_counter = 9718 --if this is higher than the regular counter, use it instead
_detalhes.build_counter = 9719
_detalhes.alpha_build_counter = 9719 --if this is higher than the regular counter, use it instead
_detalhes.bcc_counter = 31
_detalhes.dont_open_news = true
_detalhes.game_version = version
Expand Down

0 comments on commit ecf1b3b

Please sign in to comment.