diff --git a/Zenitha b/Zenitha index f6dd1fd0..62fe2c55 160000 --- a/Zenitha +++ b/Zenitha @@ -1 +1 @@ -Subproject commit f6dd1fd0c02193bc65da29f81b6ef1b61fe3aa0e +Subproject commit 62fe2c557afd7fe364e7478b3f23b7ddfe6b0541 diff --git a/assets/discordRPC.lua b/assets/discordRPC.lua index 0b83193f..1f8e84a8 100644 --- a/assets/discordRPC.lua +++ b/assets/discordRPC.lua @@ -58,13 +58,13 @@ if SYSTEM=='Windows' then local suc suc,Cname=pcall(ffi.load,"discord-rpc") if not (suc and Cname) then - LOG("Error in Loading Discord-RPC lib: "..Cname) + MSG.errorLog("Loading Discord-RPC lib: "..Cname) Cname=nil end elseif MOBILE then - LOG("No Discord-RPC for mobile devices yet") + LOG(STRING.repD("No Discord-RPC for current platform ($1)",SYSTEM)) else - LOG("Waiting Discord-RPC for other platforms") + MSG.warnLog(STRING.repD("Waiting Discord-RPC for current platform ($1)",SYSTEM)) end if Cname then diff --git a/assets/fmod20221/init.lua b/assets/fmod20221/init.lua index 597aa30b..c813354c 100644 --- a/assets/fmod20221/init.lua +++ b/assets/fmod20221/init.lua @@ -1,3 +1,4 @@ +-- Skip FMOD on web for now if SYSTEM=='Web' then local NOLL={} setmetatable(NOLL,{__call=NULL,__index=function() return NOLL end}) @@ -20,11 +21,11 @@ require'cdef' local M=require'master' M.banks={} --- (Old method) search for fmod shared libraries in package.cpath +-- --(Old method) search for fmod shared libraries in package.cpath -- local fmodPath=package.searchpath('fmod',package.cpath) -- local fmodstudioPath=package.searchpath('fmodstudio',package.cpath) --- -- pretend to load libfmod through Lua (it's going to fail but not raise any errors) so that its location is known when loading libfmodstudio through ffi --- -- package.loadlib(fmodPath,"") +-- --pretend to load libfmod through Lua (it's going to fail but not raise any errors) so that its location is known when loading libfmodstudio through ffi +-- package.loadlib(fmodPath,"") -- M.C=ffi.load(fmodPath) -- M.C2=ffi.load(fmodstudioPath) @@ -36,18 +37,18 @@ do -- Load library local suc suc,M.C=pcall(ffi.load,STRING.repD(path,'fmod')) if not suc then - MSG.new('error',"Loading FMOD lib:"..M.C) + MSG.errorLog("Loading FMOD lib:"..M.C) M.C=nil elseif not M.C then - MSG.new('error',"Error in Loading FMOD lib") + MSG.errorLog("Loaded an empty FMOD lib") end suc,M.C2=pcall(ffi.load,STRING.repD(path,'fmodstudio')) if not suc then - MSG.new('error',"Loading FMODstudio lib:"..M.C2) + MSG.errorLog("Loading FMODstudio lib:"..M.C2) M.C2=nil elseif not M.C2 then - MSG.new('error',"Error in Loading FMODstudio lib") + MSG.errorLog("Loaded an empty FMODstudio lib") end end @@ -100,8 +101,7 @@ 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 loadBank error: "..M.errorString[res]) - MSG.new('warn',"FMOD loadBank error: "..M.errorString[res]) + MSG.errorLog("FMOD loadBank error: "..M.errorString[res]) return end M.banks[path]=bank @@ -123,8 +123,7 @@ function M.loadBank2(path,flag) local bank,res=studio:loadBankMemory(data:getPointer(),size,0,flag or M.FMOD_STUDIO_LOAD_BANK_NORMAL) file:close(); file:release(); data:release() if res~=M.FMOD_OK then - LOG("FMOD loadBankMemory error: "..M.errorString[res]) - MSG.new('warn',"FMOD loadBankMemory error: "..M.errorString[res]) + MSG.errorLog("FMOD loadBankMemory error: "..M.errorString[res]) return end M.banks[path]=bank