Skip to content

Commit dfabfe5

Browse files
authored
Merge pull request #3805 from rakieldev/fixes
fix: select screen speed-up animations and duplicated cell.slot offsets
2 parents e6785a5 + 04f9410 commit dfabfe5

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

external/script/start.lua

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2546,8 +2546,8 @@ function start.updateDrawList()
25462546
if hasMultipleChars and hasPortraitAnim(motif.select_info.cell.slot) then
25472547
local icon = getTransforms(motif.select_info.cell.slot)
25482548
icon.anim = motif.select_info.cell.slot.AnimData
2549-
icon.x = motif.select_info.pos[1] + t.x + motif.select_info.cell.slot.offset[1]
2550-
icon.y = motif.select_info.pos[2] + t.y + motif.select_info.cell.slot.offset[2]
2549+
icon.x = motif.select_info.pos[1] + t.x
2550+
icon.y = motif.select_info.pos[2] + t.y
25512551
table.insert(drawList, icon)
25522552
end
25532553
end
@@ -2673,6 +2673,9 @@ function start.f_selectScreen()
26732673
staticDrawList = start.updateDrawList()
26742674
start.needUpdateDrawList = false
26752675
end
2676+
for _, item in ipairs(staticDrawList) do
2677+
animUpdate(item.anim)
2678+
end
26762679
batchDraw(staticDrawList)
26772680
--draw done cursors
26782681
for side = 1, 2 do

src/script.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2100,7 +2100,6 @@ func systemScriptInit(l *lua.LState) {
21002100
sys.luaQueueLayerDraw(int(layerLocal), func() {
21012101
(&aSnap).Draw(layerLocal)
21022102
})
2103-
aSnap.Update(true)
21042103
})
21052104
return 0
21062105
})

0 commit comments

Comments
 (0)