comparison FlightMap.lua @ 96:8591401ec278

- Fixed quest markers for other maps becoming visible due to ambiguous interpretations of pin.used. - Removed some redundant filter checking calls on pins obtained through Acquire()
author Nenue
date Sun, 14 May 2017 23:45:08 -0400
parents 98b5e08b75ed
children caa482329919
comparison
equal deleted inserted replaced
95:b29b35cb8539 96:8591401ec278
96 local pin = WorldPlanQuests:AcquirePin(info, zoneMapID) 96 local pin = WorldPlanQuests:AcquirePin(info, zoneMapID)
97 if pin then 97 if pin then
98 98
99 print(pin:GetID(), pin.used, pin.filtered) 99 print(pin:GetID(), pin.used, pin.filtered)
100 100
101 if pin.used then 101 if pin.canShow then
102 pinsToRemove[info.questId] = nil; 102 pinsToRemove[info.questId] = nil;
103 103
104 pin.used = true
104 local frame = self.activePins[info.questId] 105 local frame = self.activePins[info.questId]
105 if not frame then 106 if not frame then
106 frame = self:GetMap():AcquirePin("WorldPlanFlightPin") 107 frame = self:GetMap():AcquirePin("WorldPlanFlightPin")
107 frame:SetAlphaLimits(alpha1, alpha2, alpha3) 108 frame:SetAlphaLimits(alpha1, alpha2, alpha3)
108 frame:SetScalingLimits(scale1, scale2, scale3); 109 frame:SetScalingLimits(scale1, scale2, scale3);
117 pin.owningFrame = frame:GetMap() 118 pin.owningFrame = frame:GetMap()
118 pin:SetAnchor(frame, nil, nil, nil, nil, 1) 119 pin:SetAnchor(frame, nil, nil, nil, nil, 1)
119 pin.throttle = 1 120 pin.throttle = 1
120 pin:ClearAllPoints() 121 pin:ClearAllPoints()
121 pin:SetPoint('CENTER', frame, 'CENTER') 122 pin:SetPoint('CENTER', frame, 'CENTER')
123 pin:SetShown(true)
122 frame:SetSize(pin:GetSize()) 124 frame:SetSize(pin:GetSize())
123 --print(pin.Overlay:IsShown(), pin.Overlay:GetPoint(1)) 125 --print(pin.Overlay:IsShown(), pin.Overlay:GetPoint(1))
124 end 126 end
125 end 127 end
126 128