Convert the_teleporter (and related Ice Cave) to you.teleport_to.

2 files changed, 2 insertions, 12 deletions

diff --git a/crawl-ref/source/dat/icecave.des b/crawl-ref/source/dat/icecave.des
index 3c259e4386..f7167a408b 100644
--- a/crawl-ref/source/dat/icecave.des
+++ b/crawl-ref/source/dat/icecave.des
@@ -955,13 +955,8 @@ local function teleporter (data, triggerable, triggerer, marker, ev)
     monster.random_teleport()
   end
 
-  -- XXX: This is still unsafe! Should be replaced with aimed teleport.
-  you.moveto(my_slaves[1].x, my_slaves[1].y)
+  you.teleport_to(my_slaves[1].x, my_slaves[1].y)
   crawl.mpr("Your surroundings suddenly seem different!")
-
-  -- In order to mimic a normal teleport, even though this is certainly not.
-  dgn.apply_area_cloud(position.x, position.y, 1, 4, 1, 1,
-    "translocational energy", "you", -1)
 end
 
 -- Lua marker magic!
diff --git a/crawl-ref/source/dat/vaults.des b/crawl-ref/source/dat/vaults.des
index 5c25c750eb..d6cf959bba 100644
--- a/crawl-ref/source/dat/vaults.des
+++ b/crawl-ref/source/dat/vaults.des
@@ -305,13 +305,8 @@ local function teleporter (data, triggerable, triggerer, marker, ev)
     monster.random_teleport()
   end
 
-  -- XXX: This is still unsafe! Should be replaced with aimed teleport.
-  you.moveto(my_slaves[1].x, my_slaves[1].y)
+  you.teleport_to(my_slaves[1].x, my_slaves[1].y)
   crawl.mpr("Your surroundings suddenly seem different!")
-
-  -- In order to mimic a normal teleport, even though this is certainly not. 
-  dgn.apply_area_cloud(position.x, position.y, 1, 4, 1, 1, 
-    "translocational energy", "you", -1) 
 end
 
 -- Lua marker magic!