diff --git a/main.lua b/main.lua index da59f533..04f6b3ea 100644 --- a/main.lua +++ b/main.lua @@ -318,10 +318,7 @@ do end --Apply system setting -LANG.set(SETTING.lang) -VK.setShape(SETTING.VKSkin) -applyBlockSatur(SETTING.blockSatur) -applyFieldSatur(SETTING.fieldSatur) +applySettings() --Load replays for _,fileName in next,fs.getDirectoryItems('replay')do diff --git a/parts/gametoolfunc.lua b/parts/gametoolfunc.lua index 7ec2a564..aedfcfc8 100644 --- a/parts/gametoolfunc.lua +++ b/parts/gametoolfunc.lua @@ -12,6 +12,13 @@ local SETTING,GAME,SCR=SETTING,GAME,SCR --System +function applySettings() + love.window.setFullscreen(SETTING.fullscreen) + LANG.set(SETTING.lang) + VK.setShape(SETTING.VKSkin) + applyBlockSatur(SETTING.blockSatur) + applyFieldSatur(SETTING.fieldSatur) +end function switchFullscreen() SETTING.fullscreen=not SETTING.fullscreen love.window.setFullscreen(SETTING.fullscreen) diff --git a/parts/net.lua b/parts/net.lua index 12ca03ce..2fbfc339 100644 --- a/parts/net.lua +++ b/parts/net.lua @@ -262,6 +262,7 @@ function NET.loadSavedData(sections) success=success and FILE.save(RANKS,'conf/unlock') TABLE.update(NET.cloudData.SETTING,SETTING) + applySettings() success=success and FILE.save(SETTING,'conf/settings') TABLE.update(NET.cloudData.keyMap,keyMap) diff --git a/parts/scenes/savedata.lua b/parts/scenes/savedata.lua index f2e5c37c..979fc15d 100644 --- a/parts/scenes/savedata.lua +++ b/parts/scenes/savedata.lua @@ -55,6 +55,7 @@ scene.widgetList={ local D=parseCB() if D then TABLE.update(D,SETTING) + applySettings() if FILE.save(SETTING,'conf/settings')then MES.new('check',text.importSuccess) end