From ce0f90c86ea0fdac8d9ac0c9f06096f84d1e0aab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lilian=20J=C3=B3nsd=C3=B3ttir?= Date: Sat, 11 Jul 2020 14:38:39 -0700 Subject: [PATCH] don't display changing layout message if layout not changed --- MWSE/mods/Keyboard Layout Changer/common.lua | 5 ++++- MWSE/mods/Keyboard Layout Changer/main.lua | 5 +++-- MWSE/mods/Keyboard Layout Changer/mcm.lua | 9 +++++---- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/MWSE/mods/Keyboard Layout Changer/common.lua b/MWSE/mods/Keyboard Layout Changer/common.lua index 07f74a4..56c461d 100644 --- a/MWSE/mods/Keyboard Layout Changer/common.lua +++ b/MWSE/mods/Keyboard Layout Changer/common.lua @@ -13,16 +13,19 @@ this.modInfo = "Allows use of non-qwerty keyboard layouts.\n\nCurrently supporte function this.log(str) mwse.log("[%s] %s", this.modName, str) end -function this.changeLayout(layout) +function this.changedLayout(layout) + local changed = false if keys[layout] and (#keys[layout].lowercase == 256 and #keys[layout].uppercase == 256) then -- Thanks NullCascade mwse.memory.writeBytes({address = 0x775148, bytes = keys[layout].lowercase}) mwse.memory.writeBytes({address = 0x775248, bytes = keys[layout].uppercase}) + changed = true else local message = "Bad keys.lua file, please re-install." this.log(message) tes3.messageBox(string.format("(%s) %s", this.modName, message)) end + return changed end return this diff --git a/MWSE/mods/Keyboard Layout Changer/main.lua b/MWSE/mods/Keyboard Layout Changer/main.lua index 187e129..6f3df0f 100644 --- a/MWSE/mods/Keyboard Layout Changer/main.lua +++ b/MWSE/mods/Keyboard Layout Changer/main.lua @@ -2,8 +2,9 @@ local common = require("Keyboard Layout Changer.common") local config = require("Keyboard Layout Changer.config").getConfig() local function onInitialized() - common.log("Changing layout to " .. config.keyboardLayout) - common.changeLayout(config.keyboardLayout) + if common.changedLayout(config.keyboardLayout) then + common.log("Changed layout to " .. config.keyboardLayout) + end end event.register("initialized", onInitialized) diff --git a/MWSE/mods/Keyboard Layout Changer/mcm.lua b/MWSE/mods/Keyboard Layout Changer/mcm.lua index 8d4213d..8e794ac 100644 --- a/MWSE/mods/Keyboard Layout Changer/mcm.lua +++ b/MWSE/mods/Keyboard Layout Changer/mcm.lua @@ -25,10 +25,11 @@ local function createOptions() end local function applyLayout() - local message = "Changing layout to " .. config.keyboardLayout - tes3.messageBox(message) - common.log(message) - common.changeLayout(config.keyboardLayout) + if common.changedLayout(config.keyboardLayout) then + local message = "Changed layout to " .. config.keyboardLayout + tes3.messageBox(message) + common.log(message) + end end local template = mwse.mcm.createTemplate(common.modName)