diff options
| author | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-04 21:49:19 -0800 |
|---|---|---|
| committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-04 21:51:35 -0800 |
| commit | c73c1dad0a1d80a014ef59087aeee9f0e6171cf2 (patch) | |
| tree | 3c8bfc0b1882d6df35fede06b3b629dee1b104bc /crawl-ref/source/dat/clua/lm_flags.lua | |
| parent | 1c4f4dd987fdfe1462aef78550f46ac1f46adf26 (diff) | |
| download | crawl-ref-c73c1dad0a1d80a014ef59087aeee9f0e6171cf2.tar.gz crawl-ref-c73c1dad0a1d80a014ef59087aeee9f0e6171cf2.zip | |
Slave/master handling in the Triggerable class
The Triggerable class can now handle master/slave marker logic. See
dis_mu in hells.des for an example.
Diffstat (limited to 'crawl-ref/source/dat/clua/lm_flags.lua')
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_flags.lua | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/crawl-ref/source/dat/clua/lm_flags.lua b/crawl-ref/source/dat/clua/lm_flags.lua index 3a2f3e1b5b..c6b93b7a2b 100644 --- a/crawl-ref/source/dat/clua/lm_flags.lua +++ b/crawl-ref/source/dat/clua/lm_flags.lua @@ -80,7 +80,7 @@ function ChangeFlags:new(pars) cf.level_flags = pars.level_flags cf.branch_flags = pars.branch_flags cf.msg = pars.msg - cf.props = { flag_group = pars.group } + cf.props = util.append( cf.props, { flag_group = pars.group } ) return cf end @@ -120,10 +120,6 @@ function ChangeFlags:on_trigger(triggerer, marker, ev) return true, false end -function ChangeFlags:property(marker, pname) - return self.props[pname] or '' -end - function ChangeFlags:write(marker, th) ChangeFlags.super.write(self, marker, th) |