diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua index 5ed0f5d1c..dbaa5397f 100644 --- a/Libs/DF/fw.lua +++ b/Libs/DF/fw.lua @@ -1,6 +1,6 @@ -local dversion = 291 +local dversion = 292 local major, minor = "DetailsFramework-1.0", dversion local DF, oldminor = LibStub:NewLibrary (major, minor) @@ -340,19 +340,14 @@ 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 @@ -360,13 +355,13 @@ function DF.table.copy (t1, t2) 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 diff --git a/boot.lua b/boot.lua index 0f5a632d2..2eb6c1ab6 100644 --- a/boot.lua +++ b/boot.lua @@ -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