Merge branch 'main' into mod-patch

2024-06-06 16:41:21 +07:00
parent 387bbfaf69 137f9a0d55
commit 271769c502
128 changed files with 375 additions and 290 deletions
--- a/parts/gameFuncs.lua
+++ b/parts/gameFuncs.lua
@@ -161,8 +161,12 @@ do-- function applySettings()
        if SETTING.bg=='on' then
            BG.unlock()
            BG.setDefault(SETTING.defaultBG)
+            if SETTING.lockBG then
+                BG.lock()
+            elseif reason=='lockBG' then        -- Don't load theme too soon!
+                THEME.set(THEME.calculate(),GAME.playing)
+            end
            BG.set()
-            if SETTING.lockBG then BG.lock() end
        elseif SETTING.bg=='off' then
            BG.unlock()
            BG.set('fixColor',SETTING.bgAlpha,SETTING.bgAlpha,SETTING.bgAlpha)