diff --git a/tptmp/client/init.lua b/tptmp/client/init.lua index 156074c..34a05f9 100644 --- a/tptmp/client/init.lua +++ b/tptmp/client/init.lua @@ -39,10 +39,10 @@ local function run() local function get_id() return current_id, current_hist end - local quickauth = manager.get("quickauth", "") + local quickauth = manager.get("quickauthToken", "") local function set_qa(qa) quickauth = qa - manager.set("quickauth", quickauth) + manager.set("quickauthToken", quickauth) end local function get_qa() return quickauth diff --git a/tptmp/client/localcmd.lua b/tptmp/client/localcmd.lua index 5aee51a..40c64c3 100644 --- a/tptmp/client/localcmd.lua +++ b/tptmp/client/localcmd.lua @@ -50,7 +50,7 @@ local cmdp = command_parser.new({ local cli = localcmd.client_func_() if words[2] == "on" then localcmd.fps_sync_ = true - manager.set("fpssyn", "on") + manager.set("fpsSync", "on") if cli then cli:fps_sync(localcmd.fps_sync_) end @@ -71,7 +71,7 @@ local cmdp = command_parser.new({ return true elseif words[2] == "off" then localcmd.fps_sync_ = false - manager.set("fpssyn", "off") + manager.set("fpsSync", "off") if cli then cli:fps_sync(localcmd.fps_sync_) end @@ -193,7 +193,7 @@ local cmdp = command_parser.new({ ncseed = { func = function(localcmd, message, words, offsets) localcmd.nick_colour_seed_ = words[2] or tostring(math.random()) - manager.set("clincs", tostring(localcmd.nick_colour_seed_)) + manager.set("nickColourSeed", tostring(localcmd.nick_colour_seed_)) local cli = localcmd.client_func_() if cli then cli:nick_colour_seed(localcmd.nick_colour_seed_) @@ -247,29 +247,29 @@ function localcmd_i:reconnect_commit(reconnect) port = tostring(reconnect.port), secr = reconnect.secure and "+" or "", } - manager.set("rcroom", self.reconnect_.room) - manager.set("rchost", self.reconnect_.host) - manager.set("rcport", self.reconnect_.port) - manager.set("rcsecr", self.reconnect_.secr) + manager.set("reconnectRoom", self.reconnect_.room) + manager.set("reconnectHost", self.reconnect_.host) + manager.set("reconnectPort", self.reconnect_.port) + manager.set("reconnectSecure", self.reconnect_.secr) end local function new(params) local reconnect = { - room = manager.get("rcroom", ""), - host = manager.get("rchost", ""), - port = manager.get("rcport", ""), - secr = manager.get("rcsecr", ""), + room = manager.get("reconnectRoom", ""), + host = manager.get("reconnectHost", ""), + port = manager.get("reconnectPort", ""), + secr = manager.get("reconnectSecure", ""), } if #reconnect.room == 0 or #reconnect.host == 0 or #reconnect.port == 0 then reconnect = nil end return setmetatable({ - fps_sync_ = manager.get("fpssyn", "") == "on", + fps_sync_ = manager.get("fpsSync", "") == "on", reconnect_ = reconnect, client_func_ = params.client_func, new_client_func_ = params.new_client_func, kill_client_func_ = params.kill_client_func, - nick_colour_seed_ = manager.get("clincs", "0"), + nick_colour_seed_ = manager.get("nickColourSeed", "0"), }, localcmd_m) end diff --git a/tptmp/client/window.lua b/tptmp/client/window.lua index c588cf8..c27d6dd 100644 --- a/tptmp/client/window.lua +++ b/tptmp/client/window.lua @@ -783,11 +783,11 @@ function window_i:handle_blur() end function window_i:save_window_rect_() - manager.set("winx", tostring(self.pos_x_)) - manager.set("winy", tostring(self.pos_y_)) - manager.set("winw", tostring(self.width_)) - manager.set("winh", tostring(self.height_)) - manager.set("wina", tostring(self.alpha_)) + manager.set("windowLeft", tostring(self.pos_x_)) + manager.set("windowTop", tostring(self.pos_y_)) + manager.set("windowWidth", tostring(self.width_)) + manager.set("windowHeight", tostring(self.height_)) + manager.set("windowAlpha", tostring(self.alpha_)) end function window_i:insert_wrapped_line_(tbl, msg, line) @@ -986,11 +986,11 @@ function window_i:set_subtitle_secondary(formatted_text) end local function new(params) - local pos_x = tonumber(manager.get("winx", "")) or config.default_x - local pos_y = tonumber(manager.get("winy", "")) or config.default_y - local width = tonumber(manager.get("winw", "")) or config.default_width - local height = tonumber(manager.get("winh", "")) or config.default_height - local alpha = tonumber(manager.get("wina", "")) or config.default_alpha + local pos_x = tonumber(manager.get("windowLeft", "")) or config.default_x + local pos_y = tonumber(manager.get("windowTop", "")) or config.default_y + local width = tonumber(manager.get("windowWidth", "")) or config.default_width + local height = tonumber(manager.get("windowHeight", "")) or config.default_height + local alpha = tonumber(manager.get("windowAlpha", "")) or config.default_alpha local title = "TPT Multiplayer v" .. config.versionstr local title_width = gfx.textSize(title) local win = setmetatable({