diff options
| author | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-27 21:23:26 +1000 |
|---|---|---|
| committer | Jude Brown <bookofjude@users.sourceforge.net> | 2009-11-27 21:23:26 +1000 |
| commit | 1e8b27a0937edd99b2a141eab3335959f55bc244 (patch) | |
| tree | 609653c144a46df168e7876598014f7db1c63fbf /crawl-ref/source/dat | |
| parent | b79b287790243ed1163242063cf07ec6155ca8ee (diff) | |
| parent | ec60900d973de379c00930908bce3ae08a29ecda (diff) | |
| download | crawl-ref-1e8b27a0937edd99b2a141eab3335959f55bc244.tar.gz crawl-ref-1e8b27a0937edd99b2a141eab3335959f55bc244.zip | |
Merge branch 'master' into wizlab
Diffstat (limited to 'crawl-ref/source/dat')
| -rw-r--r-- | crawl-ref/source/dat/clua/iter.lua | 6 | ||||
| -rw-r--r-- | crawl-ref/source/dat/vaults.des | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/crawl-ref/source/dat/clua/iter.lua b/crawl-ref/source/dat/clua/iter.lua index 17dd95ffac..904bd57151 100644 --- a/crawl-ref/source/dat/clua/iter.lua +++ b/crawl-ref/source/dat/clua/iter.lua @@ -130,7 +130,7 @@ function iter.los_iterator (ic, filter, center) end end - if y_x == _x and y_y == y then + if y_x == _x and y_y == _y then return include_center end @@ -168,7 +168,7 @@ function iter.adjacent_iterator (ic, filter, center) end end - if y_x == _x and y_y == y then + if y_x == _x and y_y == _y then return include_center end @@ -207,7 +207,7 @@ function iter.circle_iterator (radius, ic, filter, center) end end - if y_x == _x and y_y == y then + if y_x == _x and y_y == _y then return include_center end diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des index 04b809e7ba..c4fae8660c 100644 --- a/crawl-ref/source/dat/vaults.des +++ b/crawl-ref/source/dat/vaults.des @@ -302,7 +302,7 @@ local m_marker = TriggerableFunction:new { repeated=true } local e_marker = TriggerableFunction:new { func=teleporter, - data = {teleport_spot=1}, + data = {teleport_spot=2}, repeated=true } m_marker:add_triggerer(DgnTriggerer:new { type="player_move" }) e_marker:add_triggerer(DgnTriggerer:new { type="player_move" }) |