From 0542ec4e69c99f06bfc46d1d2f9dae6c401af545 Mon Sep 17 00:00:00 2001 From: Insality Date: Thu, 30 Jan 2020 01:45:25 +0300 Subject: [PATCH] Move druid settings inside system folder --- druid/druid.lua | 3 ++- druid/styles/bounce/style.lua | 2 +- druid/{ => system}/settings.lua | 1 - example/example.gui.gui_script | 2 +- example/kenney/init.script | 10 +++++----- 5 files changed, 9 insertions(+), 9 deletions(-) rename druid/{ => system}/settings.lua (99%) diff --git a/druid/druid.lua b/druid/druid.lua index 8a6ce5b..2263588 100644 --- a/druid/druid.lua +++ b/druid/druid.lua @@ -7,7 +7,7 @@ local const = require("druid.const") local druid_instance = require("druid.system.druid_instance") -local settings = require("druid.settings") +local settings = require("druid.system.settings") local M = {} @@ -85,6 +85,7 @@ end function M.set_text_function(callback) settings.get_text = callback or const.EMPTY_FUNCTION + -- TODO: Update all localized text end diff --git a/druid/styles/bounce/style.lua b/druid/styles/bounce/style.lua index 2acd7e9..1a0bfa2 100644 --- a/druid/styles/bounce/style.lua +++ b/druid/styles/bounce/style.lua @@ -1,4 +1,4 @@ -local settings = require("druid.settings") +local settings = require("druid.system.settings") local anims = require("druid.styles.bounce.anims") local M = {} diff --git a/druid/settings.lua b/druid/system/settings.lua similarity index 99% rename from druid/settings.lua rename to druid/system/settings.lua index 3529af5..58b3987 100644 --- a/druid/settings.lua +++ b/druid/system/settings.lua @@ -3,7 +3,6 @@ local M = {} - M.is_debug = false diff --git a/example/example.gui.gui_script b/example/example.gui.gui_script index b640db7..bbd8be7 100644 --- a/example/example.gui.gui_script +++ b/example/example.gui.gui_script @@ -1,5 +1,5 @@ local druid = require("druid.druid") -local druid_settings = require("druid.settings") +local druid_settings = require("druid.system.settings") local lang = { locale_text = "Localized" diff --git a/example/kenney/init.script b/example/kenney/init.script index 6362a95..aa2bf5c 100644 --- a/example/kenney/init.script +++ b/example/kenney/init.script @@ -1,16 +1,16 @@ +local druid = require("druid.druid") local const = require("druid.const") -local settings = require("druid.settings") local lang = require("example.kenney.lang") local function setup_druid() - settings.play_sound = function(name) + druid.set_sound_function(function(name) sound.play("kenney:/sound#" .. name) - end + end) - settings.get_text = function(lang_id) + druid.set_text_function(function(lang_id) return lang.get_locale(lang_id) - end + end) -- TODO: Call druid.finish_setup? -- Need to update all gui, in case, when gui init was befure this init