diff options
| author | Robert Vollmert <rvollmert@gmx.net> | 2009-11-24 07:09:56 +0100 |
|---|---|---|
| committer | Robert Vollmert <rvollmert@gmx.net> | 2009-11-24 07:12:42 +0100 |
| commit | 163a5137f9e08b53f9b9e8d1b3d8801252c98e81 (patch) | |
| tree | 163ff371f3e6536fd8be9c0c368a6eb2c223f9ea /crawl-ref/source/dat/clua | |
| parent | d4e0b56366894297e22156db8d7a0511cb3e64ec (diff) | |
| download | crawl-ref-163a5137f9e08b53f9b9e8d1b3d8801252c98e81.tar.gz crawl-ref-163a5137f9e08b53f9b9e8d1b3d8801252c98e81.zip | |
Allow reactivation of lua marker.
Failed reactivation was causing error messages on travel to
off-level stashes, for example.
_loadlev_populate_stair_distances reactivates all markers, so
markers should probably handle reactivatiion gracefully.
Not sure this is the correct way to handle things, however.
Diffstat (limited to 'crawl-ref/source/dat/clua')
| -rw-r--r-- | crawl-ref/source/dat/clua/lm_trig.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/crawl-ref/source/dat/clua/lm_trig.lua b/crawl-ref/source/dat/clua/lm_trig.lua index d325d93a4c..994976f656 100644 --- a/crawl-ref/source/dat/clua/lm_trig.lua +++ b/crawl-ref/source/dat/clua/lm_trig.lua @@ -190,7 +190,8 @@ function Triggerable:activate(marker) end if self.activated then - error("Triggerable already activated") + -- _loadlev_populate_stair_distances may reactive markers + return end self.activating = true |