Fix some lua errors
This commit is contained in:
parent
e8abf56b28
commit
9bfd2617e9
4
init.lua
4
init.lua
|
@ -45,7 +45,3 @@ if g_resources.fileExists("/otclientrc.lua") then
|
||||||
dofile("/otclientrc.lua")
|
dofile("/otclientrc.lua")
|
||||||
end
|
end
|
||||||
|
|
||||||
--g_things.loadOtb("/items.otb")
|
|
||||||
--g_map.loadOtbm("/forgotten.otbm")
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -39,9 +39,9 @@ function Client.init()
|
||||||
addEvent(function()
|
addEvent(function()
|
||||||
scheduleEvent(function()
|
scheduleEvent(function()
|
||||||
-- Play startup music (The Silver Tree, by Mattias Westlund)
|
-- Play startup music (The Silver Tree, by Mattias Westlund)
|
||||||
g_sounds.playMusic("startup.ogg", 3)
|
g_sounds.playMusic("/client/startup.ogg", 3)
|
||||||
connect(g_game, { onGameStart = function() g_sounds.stopMusic(3) end })
|
connect(g_game, { onGameStart = function() g_sounds.stopMusic(3) end })
|
||||||
connect(g_game, { onGameEnd= function() g_sounds.playMusic("startup.ogg", 3) end })
|
connect(g_game, { onGameEnd= function() g_sounds.playMusic("/client/startup.ogg", 3) end })
|
||||||
end, 100)
|
end, 100)
|
||||||
end, 0)
|
end, 0)
|
||||||
end
|
end
|
||||||
|
|
|
@ -194,7 +194,12 @@ local function onGameStart()
|
||||||
|
|
||||||
if(not table.empty(lastChannelsOpen) and lastChannelsOpen[char]) then
|
if(not table.empty(lastChannelsOpen) and lastChannelsOpen[char]) then
|
||||||
for channelName, channelId in ipairs(lastChannelsOpen[char]) do
|
for channelName, channelId in ipairs(lastChannelsOpen[char]) do
|
||||||
if(not table.find(channels, channelId)) then g_game.joinChannel(channelId) end
|
channelId = tonumber(channelId)
|
||||||
|
if channelId ~= 0 then
|
||||||
|
if not table.find(channels, channelId) then
|
||||||
|
g_game.joinChannel(channelId)
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue