Workaround for 64bit shift issues for party status effects

HealsCodes · Jul 16, 2022 · 05236ed · 05236ed
1 parent 779033b
commit 05236ed
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/addons/statustimers/conf_ui.lua b/addons/statustimers/conf_ui.lua
@@ -73,7 +73,7 @@ module.render_config_ui = function(settings, toggle)
                 imgui.SliderInt('\xef\x81\x9b Icons', target_size, 14, 256, '%dpx');
                 imgui.ShowHelp('Size for target status icons.', true);
 
-                local combo_flags = bit.bor(ImGuiComboFlags_None);
+                local combo_flags = ImGuiComboFlags_None;
                 local theme_paths = resources.get_theme_paths();
 
                 if (imgui.BeginCombo('\xef\x97\x83 Theme', theme_paths[ui.theme_index[1] ], combo_flags)) then

diff --git a/addons/statustimers/party.lua b/addons/statustimers/party.lua
@@ -89,9 +89,21 @@ module.get_member_status = function(server_id)
             local status_ids = T{};
 
             for j = 0,31,1 do
-                if (icons_lo[j+1] ~= 255) then
-                    -- icons_hi holds bit 9 & 10 in a 32 entry 2bit array
-                    status_ids[#status_ids + 1] = icons_lo[j + 1] + bit.lshift(bit.band(bit.rshift(icons_hi, 2 * j), 3), 8);
+                --[[ FIXME: lua doesn't handle 64bit return values properly..
+                --   FIXME: the next lines are a workaround by Thorny that cover most but not all cases..
+                --   FIXME: .. to try and retrieve the high bits of the buff id.
+                --   TODO:  revesit this once atom0s adjusted the API.
+                --]]
+                local high_bits;
+                if j < 16 then
+                    high_bits = bit.lshift(bit.band(bit.rshift(icons_hi, 2* j), 3), 8);
+                else
+                    local buffer = math.floor(icons_hi / 0xffffffff);
+                    high_bits = bit.lshift(bit.band(bit.rshift(buffer, 2 * (j - 16)), 3), 8);
+                end
+                local buff_id = icons_lo[j+1] + high_bits;
+                if (buff_id ~= 255) then
+                    status_ids[#status_ids + 1] = buff_id;
                 end
             end
 

diff --git a/addons/statustimers/resources.lua b/addons/statustimers/resources.lua
@@ -36,7 +36,6 @@ local icon_cache = T{
 -- this table implements overrides for certain icons to handle
 -- local buffs_table = nil;
 local id_overrides = T{
-    _249 = 579
 };
 -------------------------------------------------------------------------------
 -- local functions

diff --git a/addons/statustimers/statustimers.lua b/addons/statustimers/statustimers.lua
@@ -19,7 +19,7 @@
 
 addon.name    = 'statustimers';
 addon.author  = 'heals';
-addon.version = '4.0.905';
+addon.version = '4.0.906';
 addon.desc    = 'Replacement for the default status timer display';
 addon.link    = 'https://github.com/Shirk/statustimers';