Project

General

Profile

« Previous | Next » 

Revision cdd6154d

Added by Marc Dequènes over 13 years ago

  • ID cdd6154d6bc7e5034408799b673c6766f806c293

[evol] conversation protocol complete rework + work on action protocol §1 (refs #30)

View differences:

lib/cyborghood/base/config.rb
CONFFILE_GLOBAL = "cyborghood.conf"
CONFFILE_BOT = "cyborghood_%s.conf"
attr_accessor :bot_id
def self.load(name = nil)
# load all config parts
g_config_raw = load_config_raw()
......
end
end
protected
def self.merge_into_default_config(conf_default, conf)
protected def self.merge_into_default_config(conf_default, conf)
new_conf = conf_default.dup
conf.each_pair do |k, v|
if conf_default.has_key?(k) and conf_default[k].is_a?(Hash) and v.is_a?(Hash)

Also available in: Unified diff