Skip to content

Commit

Permalink
从内存加载bank的方案失败后会永久地自动切换为绝对路径加载方案并弹出提示
Browse files Browse the repository at this point in the history
  • Loading branch information
MrZ626 committed Jul 12, 2024
1 parent c072d09 commit 7be2e39
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions assets/fmod20221/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ function M.loadBank(path,flag)
if not studio then return end
local bank,res=studio:loadBankFile(path,flag or M.FMOD_STUDIO_LOAD_BANK_NORMAL)
if res~=M.FMOD_OK then
LOG("FMOD loadBankMemory error: "..M.errorString[res])
MSG.new('warn',"FMOD loadBankMemory error: "..M.errorString[res])
LOG("FMOD loadBank error: "..M.errorString[res])
MSG.new('warn',"FMOD loadBank error: "..M.errorString[res])
return
end
M.banks[path]=bank
Expand Down
1 change: 1 addition & 0 deletions assets/settings.lua
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ local settings={
sfxVol=1,
vocVol=0,
vibVol=1,
fmod_loadMemory=true,
fmod_maxChannel=32,
fmod_DSPBufferCount=4,
fmod_DSPBufferLength=8,
Expand Down
4 changes: 3 additions & 1 deletion main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -350,12 +350,14 @@ LANG.add{
LANG.setDefault('en')

function FMODLoadFunc() -- Will be called again when applying advanced options
local memLoad=true
local memLoad=SETTINGS.system.fmod_loadMemory
local function loadBank(path)
if memLoad then
local bank=FMOD.loadBank2(path)
if bank then return bank end
memLoad=false
SETTINGS.system.fmod_loadMemory=false
MSG.new('other',"Switched to another bank loading mode")
end
return FMOD.loadBank(love.filesystem.getSaveDirectory()..'/'..path)
end
Expand Down

0 comments on commit 7be2e39

Please sign in to comment.