Skip to content

Commit

Permalink
调整一些左上角的警告消息
Browse files Browse the repository at this point in the history
  • Loading branch information
MrZ626 committed Jun 27, 2024
1 parent 50a01fe commit 3ac6602
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion assets/game/exteriorMap.lua
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ local function _enterMode(m)
FMOD.effect('map_enter')
SCN.go('game_out','fade','brik/exterior/'..m.name)
else
MSG.new('warn',"Mode file not exist")
MSG.new('warn',"No mode file")
end
end
end
Expand Down
9 changes: 5 additions & 4 deletions main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ LANG.setDefault('en')

function FMODLoadFunc() -- Will be called again when applying advanced options
if not (FMOD.C and FMOD.C2) then
MSG.new('error',"FMOD Studio initialization failed")
MSG.new('error',"FMOD library loaded failed")
return
end

Expand All @@ -359,6 +359,7 @@ function FMODLoadFunc() -- Will be called again when applying advanced options
studioFlag=bit.bxor(FMOD.FMOD_STUDIO_INIT_SYNCHRONOUS_UPDATE,FMOD.FMOD_INIT_STREAM_FROM_UPDATE,FMOD.FMOD_INIT_MIX_FROM_UPDATE),
coreFlag=FMOD.FMOD_INIT_NORMAL,
}

if not FMOD.loadBank2('soundbank/Master.strings.bank') then
MSG.new('warn',"Strings bank file load failed")
end
Expand Down Expand Up @@ -617,19 +618,19 @@ SCN.addSwapStyle('fastFadeHeader',{

FMODLoadFunc()
if tostring(FMOD.studio):find('NULL') or TABLE.getSize(FMOD.banks)==0 then
MSG.new('error',"FMOD Studio initialization failed")
MSG.new('error',"FMOD initialization failed")
else
FMOD.setMainVolume(SETTINGS.system.mainVol,true)
for name,data in next,SONGBOOK do
if FMOD.music.getDesc(name) then
data.intensity=FMOD.music.getParamDesc(name,'intensity')~=nil
data.section=FMOD.music.getParamDesc(name,'section')~=nil
if not FMOD.music.getParamDesc(name,'fade') then
MSG.new('warn',"Missing 'fade' parameter in music '"..name.."'")
MSG.new('warn',"Missing 'fade' parameter in music '"..name.."'",0)
end
else
data.notFound=true
MSG.new('warn',"Music '"..name.."' not found in FMOD")
MSG.new('warn',"Music '"..name.."' not found in FMOD",0)
end
end
end
Expand Down

0 comments on commit 3ac6602

Please sign in to comment.