diff options
| author | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-08 20:02:10 -0800 |
|---|---|---|
| committer | Matthew Cline <zelgadis@sourceforge.net> | 2009-11-08 20:02:10 -0800 |
| commit | 1a44a619bba65a4faf31476dcd572c40b9469b21 (patch) | |
| tree | 38b134c2e25d51f7957e9b49accea7e4a133ab25 /crawl-ref/source/dat/clua | |
| parent | 0d3adcf82d1206b1dbffbf205bead9d36100fa96 (diff) | |
| download | crawl-ref-1a44a619bba65a4faf31476dcd572c40b9469b21.tar.gz crawl-ref-1a44a619bba65a4faf31476dcd572c40b9469b21.zip | |
lm_trig.lua: Forgot to remove master listener
Diffstat (limited to 'crawl-ref/source/dat/clua')
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_trig.lua | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crawl-ref/source/dat/clua/lm_trig.lua b/crawl-ref/source/dat/clua/lm_trig.lua index 65faafb3ea..11d47607f8 100644 --- a/crawl-ref/source/dat/clua/lm_trig.lua +++ b/crawl-ref/source/dat/clua/lm_trig.lua @@ -296,8 +296,11 @@ function Triggerable:do_trigger(triggerer, marker, ev) if dgn.point(slave_marker:pos()) == master_pos then -- The master marker shouldn't be removed until the end, so - -- simply stop being slaved. + -- simply stop being slaved to itself. self.props.slaved_to = nil + if self:property("listen_to_slaves") ~= "" then + triggerer:remove(self, slave_marker) + end else triggerer:remove(self, slave_marker) dgn.remove_marker(slave_marker) |