changeset 119:b528ba7c239c v7.3.2-20171712

lexical bits
author Nenue
date Sun, 17 Dec 2017 18:43:29 -0500
parents 5916b9b8486b
children c9b4e33d4d93
files FilterBar.lua WorldMap.lua
diffstat 2 files changed, 8 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/FilterBar.lua	Fri Dec 15 16:39:06 2017 -0500
+++ b/FilterBar.lua	Sun Dec 17 18:43:29 2017 -0500
@@ -416,8 +416,6 @@
     GameTooltip:AddLine(self.info.label)
     wipe(found)
 
-
-
     if self.numQuestsHere >= 1 then
       if self.numQuestsHere < self.numQuestsTotal then
         GameTooltip:AddLine('This Zone', 1, 1, 0)
@@ -447,7 +445,6 @@
       end
     end
 
-
     GameTooltip:AddLine(self.numQuestsTotal .. ' total')
     GameTooltip:Show()
   end
--- a/WorldMap.lua	Fri Dec 15 16:39:06 2017 -0500
+++ b/WorldMap.lua	Sun Dec 17 18:43:29 2017 -0500
@@ -188,29 +188,11 @@
 end
 
 function Module:OnUpdate(sinceLast)
-  if WorldPlanData.DebugEnabled then
-    if self.refreshBenchMarkTicker then
-      --print(self.refreshBenchMarkTicker)
-      self.refreshBenchMarkTicker =   self.refreshBenchMarkTicker - 1
-
-      if self.refreshBenchMarkTicker == 0 then
-
-        self.refreshTime = floor((GetTime() - self.refreshBenchMark) * 1000)
-        self.debugMessage:SetText(self.refreshTime)
-        self.refreshBenchMarkTicker = nil
-      end
-    else
-      self.refreshBenchMark = GetTime()
-    end
-  end
 
   if self.filtersDirty or self.isStale then
     self:Refresh()
   end
 
-  if self.tasksDirty then
-    self:UpdateTaskPOIs()
-  end
 
 
   if #db.UpdatedPins >= 1 then
@@ -332,10 +314,10 @@
 function Module:UpdateTaskPOIs()
   canTargetQuests = SpellCanTargetQuest()
 
-  if InCombatLockdown() then
+  --if InCombatLockdown() then
     self.tasksDirty = true
-    return
-  end
+  --  return
+  --end
 
 
   for i = 1, NUM_WORLDMAP_TASK_POIS do
@@ -350,7 +332,7 @@
     end
   end
 
-  self.tasksDirty = false
+  self.tasksDirty = nil
 end
 -- re-anchors and scales pins that have had either of these changed due to data loading delays
 function Module:UpdateNext()
@@ -583,6 +565,8 @@
     end
   end
 
+  -- Argus inset
+
 
 end
 
@@ -600,8 +584,8 @@
   for index, info in pairs(taskInfo) do
     local questID, x, y = info.questId, info.x, info.y
 
-    -- rough workaround for argus map; flightmap and world map images are different, so not completely accurate
-    if transformFlags and x and y then
+    -- rough workaround for argus continent map that uses a different image
+    if x and y and(db.currentMapID == 1184)  then
       print(x,y)
       x = x / 2 + .25
       y = y / 2 + .30