Digitalstack/otclient
2
0
Fork 0
mirror of https://github.com/edubart/otclient.git synced 2025-10-14 11:34:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'revgraphics'

Browse Source
This commit is contained in:
Eduardo Bart
2011-12-01 20:33:45 -02:00
parent 7eb57d5802 d5e15d1f06
commit 9bb7332ac0
60 changed files with 460 additions and 11756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/entergame/characterlist.lua
View File

@@ -47,7 +47,7 @@ local function tryLogin(charInfo, tries)
end
-- save last used character
Configs.set('lastUsedCharacter', charInfo.characterName)
ConfigManager.set('lastUsedCharacter', charInfo.characterName)
end
-- public functions
@@ -75,7 +75,7 @@ function CharacterList.create(characters, premDays)
label.worldHost = worldHost
label.worldPort = worldIp
if i == 1 or Configs.get('lastUsedCharacter') == characterName then
if i == 1 or ConfigManager.get('lastUsedCharacter') == characterName then
characterList:focusChild(label, ActiveFocusReason)
end
end

28
modules/entergame/entergame.lua
View File

@@ -11,8 +11,8 @@ local function clearAccountFields()
enterGame:getChildById('accountNameLineEdit'):clearText()
enterGame:getChildById('accountPasswordLineEdit'):clearText()
enterGame:getChildById('accountNameLineEdit'):focus()
Configs.set('account', nil)
Configs.set('password', nil)
ConfigManager.set('account', nil)
ConfigManager.set('password', nil)
end
local function onError(protocol, error)
@@ -30,9 +30,9 @@ end
local function onCharacterList(protocol, characters, premDays)
if enterGame:getChildById('rememberPasswordBox'):isChecked() then
Configs.set('account', EnterGame.account)
Configs.set('password', EnterGame.password)
Configs.set('autologin', tostring(enterGame:getChildById('autoLoginBox'):isChecked()))
ConfigManager.set('account', EnterGame.account)
ConfigManager.set('password', EnterGame.password)
ConfigManager.set('autologin', tostring(enterGame:getChildById('autoLoginBox'):isChecked()))
else
clearAccountFields()
end
@@ -40,9 +40,9 @@ local function onCharacterList(protocol, characters, premDays)
loadBox:destroy()
CharacterList.create(characters, premDays)
local lastMotdNumber = tonumber(Configs.get("motd"))
local lastMotdNumber = tonumber(ConfigManager.get("motd"))
if motdNumber and motdNumber ~= lastMotdNumber then
Configs.set("motd", motdNumber)
ConfigManager.set("motd", motdNumber)
local motdBox = displayInfoBox("Message of the day", motdMessage)
motdBox.onOk = CharacterList.show
CharacterList.hide()
@@ -53,11 +53,11 @@ end
function EnterGame.create()
enterGame = UI.display('entergame.otui')
local account = Configs.get('account')
local password = Configs.get('password')
local host = Configs.get('host')
local port = tonumber(Configs.get('port'))
local autologin = toboolean(Configs.get('autologin'))
local account = ConfigManager.get('account')
local password = ConfigManager.get('password')
local host = ConfigManager.get('host')
local port = tonumber(ConfigManager.get('port'))
local autologin = toboolean(ConfigManager.get('autologin'))
enterGame:getChildById('accountNameLineEdit'):setText(account)
enterGame:getChildById('accountPasswordLineEdit'):setText(password)
@@ -93,8 +93,8 @@ function EnterGame.doLogin()
EnterGame.port = enterGame:getChildById('serverPortLineEdit'):getText()
EnterGame.hide()
Configs.set('host', EnterGame.host)
Configs.set('port', EnterGame.port)
ConfigManager.set('host', EnterGame.host)
ConfigManager.set('port', EnterGame.port)
local protocolLogin = ProtocolLogin.create()
protocolLogin.onError = onError

8
modules/options/options.lua
View File

@@ -6,8 +6,8 @@ local fpsEnabled = false
local vsyncEnabled = false
function getConfig(name, default)
if Configs.exists(name) then
local val = string.trim(Configs.get(name))
if ConfigManager.exists(name) then
local val = string.trim(ConfigManager.get(name))
if val == 'true' or val == 'false' then
return toboolean(val)
else
@@ -15,7 +15,7 @@ function getConfig(name, default)
end
else
if default ~= nil then
Configs.set(name, default)
ConfigManager.set(name, default)
return default
else
return nil
@@ -24,7 +24,7 @@ function getConfig(name, default)
end
function setConfig(name, value)
Configs.set(name, tostring(value))
ConfigManager.set(name, tostring(value))
end
-- private functions