From 57b9bac4a2c57e55ee1a46442382c423d106ae33 Mon Sep 17 00:00:00 2001 From: domi41 Date: Wed, 12 Aug 2020 22:33:14 +0200 Subject: [PATCH] fix: Config is utterly broken --- core/Config.gd | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/core/Config.gd b/core/Config.gd index 290b00f..91cbd82 100644 --- a/core/Config.gd +++ b/core/Config.gd @@ -13,11 +13,11 @@ var __config : Dictionary func get_parameter(parameter_key:String, default=null): hydrate_lazily() - if parameter_key in self.__config: + if self.__config.has(parameter_key): +# print("[Config] Reading parameter `%s' from Config." % parameter_key) return self.__config[parameter_key] else: -# printerr("[Config] Unknown parameter `%s'." % parameter_key) -# assert(false) +# print("[Config] Using default value for parameter `%s'." % parameter_key) return default @@ -27,7 +27,7 @@ func set_parameter(parameter_key:String, parameter_value) -> void: func hydrate_lazily() -> void: - if null == self.__config: + if null == self.__config or self.__config.empty(): self.__config = load_from_file() @@ -48,5 +48,6 @@ func load_from_file() -> Dictionary: printerr("[Config] Cannot read from file `%s'." % self.file_path) return {} # null var data = file.get_var() + assert(data is Dictionary) file.close() return data