From 6f6801141a6e9df76d8bd7cb8e17b856a188ec97 Mon Sep 17 00:00:00 2001
From: James Whitehead II <jnwhiteh@gmail.com>
Date: Tue, 12 Aug 2008 11:44:42 +0000
Subject: [PATCH] Fixed a number of massive bugs in TomTom's zoning code

---
 TomTom.lua            |   23 ++++++++++-------------
 TomTom_CrazyArrow.lua |    2 --
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/TomTom.lua b/TomTom.lua
index 834da8c..e9227f3 100755
--- a/TomTom.lua
+++ b/TomTom.lua
@@ -19,7 +19,7 @@ TomTom = {
 	eventFrame = CreateFrame("Frame"),
 	RegisterEvent = function(self, event, method)
 		self.eventFrame:RegisterEvent(event)
-		self.events[event] = event or method
+		self.events[event] = method or event
 	end,
 	UnregisterEvent = function(self, event)
 		self.eventFrame:UnregisterEvent(event)
@@ -157,6 +157,8 @@ function TomTom:ReloadOptions()
 end
 
 function TomTom:ReloadWaypoints()
+	self:ShowHideCoordBlock()
+
 	-- Hide any waypoints that might be currently set
 	for uid,point in pairs(waypoints) do
 		self:ClearWaypoint(uid)
@@ -166,7 +168,12 @@ function TomTom:ReloadWaypoints()
 	self.waypoints = waypoints
 	self.waypointprofile = self.waydb.profile
 
-	local pc,pz = self:GetCurrentCZ()
+	if IsInInstance() then
+		return 
+	end
+
+	--local pc,pz = GetCurrentMapContinent(), GetCurrentMapZone()
+	local pc, pz = GetCurrentMapContinent(), GetCurrentMapZone()
 
 	for zone,data in pairs(self.waypointprofile) do
 		local c,z = self:GetCZ(zone)
@@ -624,16 +631,6 @@ end
 
 local function noop() end
 
-function TomTom:GetCurrentCZ()
-	local oc,oz = Astrolabe:GetCurrentPlayerPosition()
-	SetMapToCurrentZone()
-	local c,z = Astrolabe:GetCurrentPlayerPosition()
-	if oc and oz then
-		SetMapZoom(oc,oz)
-	end
-	return c,z
-end
-
 function TomTom:RemoveWaypoint(uid)
 	local data = waypoints[uid]
 	self:ClearWaypoint(uid)
@@ -661,7 +658,7 @@ end
 
 -- TODO: Make this not suck
 function TomTom:AddWaypoint(x, y, desc, persistent, minimap, world, silent)
-	local c,z = self:GetCurrentCZ()
+	local c,z = GetCurrentMapContinent(), GetCurrentMapZone()
 
 	if not c or not z or c < 1 then
 		--self:Print("Cannot find a valid zone to place the coordinates")
diff --git a/TomTom_CrazyArrow.lua b/TomTom_CrazyArrow.lua
index 37c1467..35d66e1 100644
--- a/TomTom_CrazyArrow.lua
+++ b/TomTom_CrazyArrow.lua
@@ -112,8 +112,6 @@ function TomTom:SetCrazyArrow(uid, dist, title)
 		arrive_distance = dist
 		point_title = title 
 
-		local c,z,x,y = Astrolabe:GetCurrentPlayerPosition()
-
 		wayframe.title:SetText(title or "Unknown waypoint")
 		wayframe:Show()
 	end
-- 
1.7.9.5