Removed all references to Cartographer. Cartographer support will not be included ever again.
Cette révision appartient à :
Parent
d8f5f276be
révision
b87a429214
|
@ -9,14 +9,13 @@
|
|||
## Notes-koKR: 노선에 대한 계산을 수행합니다.
|
||||
## Version: 4.0.1.$svnversion$
|
||||
## Dependencies: QHData-base
|
||||
## OptionalDeps: Cartographer_Waypoints, TomTom, Cartographer_InstanceMaps, !Swatter, tekticles, UnicodeFont, ClearFont2
|
||||
## OptionalDeps: TomTom, !Swatter, tekticles, UnicodeFont, ClearFont2
|
||||
## SavedVariables: QuestHelper_Pref QuestHelper_UID QuestHelper_SaveDate QuestHelper_Errors QuestHelper_Collector QuestHelper_Collector_Version QHDB_Export
|
||||
## SavedVariablesPerCharacter: QuestHelper_KnownFlightRoutes QuestHelper_Home QuestHelper_CharVersion QuestHelper_Flight_Updates
|
||||
## X-Website: http://www.quest-helper.com/
|
||||
## X-Embeds: AstrolabeQH, ChatThrottleLib
|
||||
|
||||
# Explanation of optional deps:
|
||||
# Cartographer_Waypoints and Tomtom are there so I can link with their arrows properly.
|
||||
# Swatter really likes intercepting all error messages and not letting them through. Since I want to intercept my own messages, I go after Swatter so I can insert my hook earlier on.
|
||||
# Tekticles is around because, if QH loads before it does, then QH doesn't use its custom fonts, and I think its custom fonts are pretty. There's probably a better solution to this, but it turns out I'm incredibly lazy, so, meh.
|
||||
# UnicodeFont: see Tekticles
|
||||
|
@ -198,7 +197,6 @@ collect_merchant.lua
|
|||
collect_warp.lua
|
||||
collect.lua
|
||||
|
||||
cartographer.lua
|
||||
tomtom.lua
|
||||
arrow.lua
|
||||
|
||||
|
|
|
@ -1,71 +0,0 @@
|
|||
QuestHelper_File["cartographer.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["cartographer.lua"] = GetTime()
|
||||
|
||||
local cartographer_cb
|
||||
local cartographer_wp
|
||||
|
||||
local QuestHelperPoint
|
||||
|
||||
local function cartographer_wp_update(c, z, x, y, desc)
|
||||
if cartographer_wp then
|
||||
cartographer_wp:Cancel()
|
||||
end
|
||||
|
||||
if not QuestHelper_Pref.hide and c and c >= 0 then
|
||||
cartographer_wp = QuestHelperPoint:new(c, z, x, y, desc)
|
||||
Cartographer_Waypoints:AddWaypoint(cartographer_wp)
|
||||
end
|
||||
end
|
||||
|
||||
function QuestHelper:EnableCartographer()
|
||||
if Cartographer_Waypoints and Waypoint and not Waypoint.prototype then
|
||||
if not QuestHelperPoint then
|
||||
QuestHelperPoint = Waypoint:new()
|
||||
QuestHelperPoint.ShowOnMap = false
|
||||
|
||||
function QuestHelperPoint:init(c, z, x, y, desc)
|
||||
self.x, self.y, self.task = x, y, desc
|
||||
|
||||
local zone = QuestHelper.Astrolabe:GetMapVirtualZones(c)[z] -- wellllp
|
||||
|
||||
if Rock then
|
||||
local LibBabble = Rock("LibBabble-Zone-3.0", false, true)
|
||||
if LibBabble then
|
||||
zone = LibBabble:GetReverseLookupTable()[zone]
|
||||
end
|
||||
end
|
||||
|
||||
self.Zone = zone
|
||||
end
|
||||
|
||||
function QuestHelperPoint:Cancel()
|
||||
self.task = nil
|
||||
|
||||
if cartographer_wp == self then
|
||||
cartographer_wp = nil
|
||||
end
|
||||
|
||||
Waypoint.Cancel(self)
|
||||
end
|
||||
|
||||
function QuestHelperPoint:ToString()
|
||||
return self.task or "Waypoint"
|
||||
end
|
||||
end
|
||||
|
||||
if not cartographer_cb then
|
||||
cartographer_cb = QuestHelper:AddWaypointCallback(cartographer_wp_update)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function QuestHelper:DisableCartographer()
|
||||
if cartographer_cb then
|
||||
if cartographer_wp then
|
||||
cartographer_wp:Cancel()
|
||||
end
|
||||
|
||||
QuestHelper:RemoveWaypointCallback(cartographer_cb)
|
||||
cartographer_cb = nil
|
||||
end
|
||||
end
|
|
@ -927,35 +927,6 @@ function addon:GenerateOptions()
|
|||
type = "description",
|
||||
name = L["PluginIntro"],
|
||||
},
|
||||
-- Cartographer = {
|
||||
-- order = 2,
|
||||
-- type = "group",
|
||||
-- guiInline = true,
|
||||
-- name = L["PluginCartographerName"],
|
||||
-- desc = L["PluginCartographerDesc"],
|
||||
-- disabled = function()
|
||||
-- return not Cartographer_Waypoints or QuestHelper_Pref['hide'];
|
||||
-- end,
|
||||
-- args = {
|
||||
-- Arrow = {
|
||||
-- order = 1,
|
||||
-- type = "toggle",
|
||||
-- name = L["CartographerArrowName"],
|
||||
-- desc = L["CartographerArrowDesc"],
|
||||
-- get = function(i)
|
||||
-- return QuestHelper_Pref['cart_wp_new'];
|
||||
-- end,
|
||||
-- set = function(i, v)
|
||||
-- QuestHelper_Pref['cart_wp_new'] = v;
|
||||
-- if QuestHelper_Pref['cart_wp_new'] then
|
||||
-- QuestHelper:EnableCartographer();
|
||||
-- else
|
||||
-- QuestHelper:DisableCartographer();
|
||||
-- end
|
||||
-- end,
|
||||
-- },
|
||||
-- },
|
||||
-- },
|
||||
TomTom = {
|
||||
order = 2,
|
||||
type = "group",
|
||||
|
|
|
@ -249,7 +249,6 @@ function QuestHelper_ErrorCatcher.OnError(o_msg, o_frame, o_stack, o_etype, ...)
|
|||
)
|
||||
or (
|
||||
string.find(debugstack(2, 20, 20), "QuestHelper") -- We're being a little overzealous and catching any bug with "QuestHelper" in the stack. This possibly should be removed, I'm not sure it's ever caught anything interesting.
|
||||
and not string.find(o_msg, "Cartographer_POI") -- Cartographer started throwing ridiculous numbers of errors on startup with QH in the stack, and since we caught stuff with QH in the stack, we decided these errors were ours. Urgh. Disabled.
|
||||
)
|
||||
)
|
||||
and not string.match(o_msg, "WTF\\Account\\.*") -- Sometimes the WTF file gets corrupted. This isn't our fault, since we weren't involved in writing it, and there's also nothing we can do about it - in fact we can't even retrieve the remnants of the old file. We may as well just ignore it. I suppose we could pop up a little dialog saying "clear some space on your hard drive, dufus" but, meh.
|
||||
|
|
|
@ -437,25 +437,6 @@ function QuestHelper:ToggleRadar(text)
|
|||
end
|
||||
end
|
||||
|
||||
function QuestHelper:ToggleCartWP()
|
||||
QuestHelper_Pref.cart_wp_new = not QuestHelper_Pref.cart_wp_new
|
||||
if QuestHelper_Pref.cart_wp_new then
|
||||
self:EnableCartographer()
|
||||
if Cartographer_Waypoints then
|
||||
if Waypoint and Waypoint.prototype then
|
||||
self:TextOut("Would use "..self:HighlightText("Cartographer Waypoints").." to show objectives, but another mod is interfering with it.")
|
||||
else
|
||||
self:TextOut(QHFormat("SETTINGS_ARROWLINK_ON", QHText("SETTINGS_ARROWLINK_CART")))
|
||||
end
|
||||
else
|
||||
self:TextOut("Would use "..self:HighlightText("Cartographer Waypoints").." to show objectives, except it doesn't seem to be present.")
|
||||
end
|
||||
else
|
||||
self:DisableCartographer()
|
||||
self:TextOut(QHFormat("SETTINGS_ARROWLINK_OFF", QHText("SETTINGS_ARROWLINK_CART")))
|
||||
end
|
||||
end
|
||||
|
||||
function QuestHelper:ToggleTomTomWP()
|
||||
QuestHelper_Pref.tomtom_wp_new = not QuestHelper_Pref.tomtom_wp_new
|
||||
if QuestHelper_Pref.tomtom_wp_new then
|
||||
|
@ -772,10 +753,6 @@ commands =
|
|||
"Toggles distance units between metres and yards.",
|
||||
{}, QuestHelper.ToggleMetric, QuestHelper},
|
||||
|
||||
{"CARTWP",
|
||||
"Toggles displaying the current objective using Cartographer Waypoints (must be installed separately).",
|
||||
{}, QuestHelper.ToggleCartWP, QuestHelper},
|
||||
|
||||
{"TOMTOM",
|
||||
"Toggles displaying the current objective using TomTom (must be installed separately).",
|
||||
{}, QuestHelper.ToggleTomTomWP, QuestHelper},
|
||||
|
|
|
@ -42,7 +42,6 @@ local QuestHelper_DefaultPref =
|
|||
show_ants = true,
|
||||
level = 3,
|
||||
hide = false,
|
||||
cart_wp_new = false,
|
||||
tomtom_wp_new = false,
|
||||
arrow = true,
|
||||
arrow_locked = false,
|
||||
|
@ -176,8 +175,6 @@ function QuestHelper:UnsetTargetLocation()
|
|||
end
|
||||
|
||||
local interruptcount = 0 -- counts how many "played gained control" messages we recieve, used for flight paths
|
||||
local init_cartographer_later = false
|
||||
|
||||
|
||||
local startup_time
|
||||
local please_submit_enabled = true
|
||||
|
@ -238,7 +235,6 @@ QH_Event("ADDON_LOADED", function (addonid)
|
|||
["flightpath.lua"] = true,
|
||||
["tracker.lua"] = true,
|
||||
["objtips.lua"] = true,
|
||||
["cartographer.lua"] = true,
|
||||
["tomtom.lua"] = true,
|
||||
["textviewer.lua"] = true,
|
||||
["error.lua"] = true,
|
||||
|
@ -533,10 +529,6 @@ QH_Event("ADDON_LOADED", function (addonid)
|
|||
QuestHelper:InitMapButton()
|
||||
end
|
||||
|
||||
if QuestHelper_Pref.cart_wp_new then
|
||||
init_cartographer_later = true
|
||||
end
|
||||
|
||||
if QuestHelper_Pref.tomtom_wp_new then
|
||||
self:EnableTomTom()
|
||||
end
|
||||
|
@ -611,12 +603,6 @@ QH_Event("ADDON_LOADED", function (addonid)
|
|||
end
|
||||
end)
|
||||
|
||||
-- There's a bug in Cartographer where SetMapZoom() or SetMapToCurrentZone(), called in an instance, causes any open menus to instantly close. Questhelper (and in general, anything that uses Astrolabe, and other UI mods as well) call those function every frame if the map is closed. This isn't a performance problem or anything, but it happens to trigger the Cartographer bug.
|
||||
-- Removing Cartographer_InstanceMaps hack. Warn user.
|
||||
if Cartographer and Cartographer.SetCurrentInstance and Cartographer_InstanceMaps and Cartographer_InstanceMaps.OnEnable then
|
||||
QH_fixedmessage("Cartographer is no longer supported. Your interface may not work properly in instances. Please remove Cartographer and restart WoW.")
|
||||
end
|
||||
|
||||
QuestHelper.loading_init3:SetPercentage(1.0) -- victory
|
||||
|
||||
QuestHelper_Loadtime["init3_end"] = time()
|
||||
|
@ -916,13 +902,6 @@ Thanks for testing!]], "QuestHelper " .. version_string, 500, 20, 10)
|
|||
end
|
||||
QHUpdateNagTick() -- These probably shouldn't be in OnUpdate. Eventually I'll move them somewhere cleaner.
|
||||
|
||||
if init_cartographer_later and Cartographer_Waypoints then -- there has to be a better way to do this
|
||||
init_cartographer_later = false
|
||||
if QuestHelper_Pref.cart_wp_new then
|
||||
self:EnableCartographer()
|
||||
end
|
||||
end
|
||||
|
||||
if not ontaxi and UnitOnTaxi("player") then
|
||||
self:flightBegan()
|
||||
interruptcount = 0
|
||||
|
|
|
@ -31,12 +31,6 @@ function QuestHelper:DoSettingsMenu()
|
|||
QH_Arrow_PopulateMenu(arrowmenu)
|
||||
self:CreateMenuItem(menu, QHText("SETTINGS_ARROWLINK_ARROW")):SetSubmenu(arrowmenu)
|
||||
|
||||
-- Cartographer Waypoints
|
||||
if Cartographer_Waypoints then
|
||||
self:CreateMenuItem(menu, QHFormat("SETTINGS_MENU_CARTWP", QuestHelper_Pref.cart_wp_new and QHText("MENU_DISABLE") or QHText("MENU_ENABLE")))
|
||||
:SetFunction(self.ToggleCartWP, self)
|
||||
end
|
||||
|
||||
-- TomTom
|
||||
if TomTom then
|
||||
self:CreateMenuItem(menu, QHFormat("SETTINGS_MENU_TOMTOM", QuestHelper_Pref.tomtom_wp_new and QHText("MENU_DISABLE") or QHText("MENU_ENABLE")))
|
||||
|
@ -253,17 +247,10 @@ function QuestHelper:InitMapButton()
|
|||
QH_Hook(button, "OnHide", QuestHelper_WorldMapHidden)
|
||||
|
||||
-- Position it on the World Map frame
|
||||
--~ if Cartographer then
|
||||
--~ -- If Cartographer is in use, coordinate with their buttons.
|
||||
-- Trouble is, this makes Cartographer's buttons conflict with the Zone Map dropdown.
|
||||
-- Re-enable this if Cartographer ever learns to work with the Zone Map dropdown.
|
||||
--~ Cartographer:AddMapButton(button, 3)
|
||||
--~ else
|
||||
-- Otherwise, just put it in the upper right corner
|
||||
button:SetPoint("TOPRIGHT", WorldMapButton, "TOPRIGHT", -10, -10)
|
||||
button:SetFrameLevel(WorldMapButton:GetFrameLevel()+1)
|
||||
button:SetFrameStrata("FULLSCREEN")
|
||||
-- end
|
||||
|
||||
-- Save the button so we can reference it later if need be
|
||||
self.MapButton = button
|
||||
|
|
|
@ -371,12 +371,6 @@ function QuestHelper_BuildZoneLookup()
|
|||
if built then return end
|
||||
built = true
|
||||
|
||||
local cartugh
|
||||
if Cartographer_Notes and not Cartographer_Notes.fixed_that_bug_that_causes_POI_to_crash_when_you_change_to_hrothgars_landing then
|
||||
cartugh = Cartographer_Notes.SetNote
|
||||
Cartographer_Notes.SetNote = function () end -- cartographer why are you terrible
|
||||
end
|
||||
|
||||
if GetMapContinents and GetMapZones then
|
||||
-- Called from inside the WoW client.
|
||||
|
||||
|
@ -472,9 +466,6 @@ function QuestHelper_BuildZoneLookup()
|
|||
QuestHelper:Assert(QuestHelper:ZoneSanity())
|
||||
end
|
||||
|
||||
if Cartographer_Notes and not Cartographer_Notes.fixed_that_bug_that_causes_POI_to_crash_when_you_change_to_hrothgars_landing then
|
||||
Cartographer_Notes.SetNote = cartugh
|
||||
end
|
||||
-- We are broken by the time we get here. Time to turn these TextOut's to Errors.
|
||||
QuestHelper:Assert(QuestHelper:ZoneSanity())
|
||||
end
|
||||
|
|
|
@ -241,7 +241,6 @@ function QuestHelper_WarningCatcher.OnWarning(o_msg, o_frame, o_stack, o_etype,
|
|||
)
|
||||
or (
|
||||
string.find(debugstack(2, 20, 20), "QuestHelper") -- We're being a little overzealous and catching any bug with "QuestHelper" in the stack. This possibly should be removed, I'm not sure it's ever caught anything interesting.
|
||||
and not string.find(o_msg, "Cartographer_POI") -- Cartographer started throwing ridiculous numbers of warnings on startup with QH in the stack, and since we caught stuff with QH in the stack, we decided these warnings were ours. Urgh. Disabled.
|
||||
)
|
||||
)
|
||||
and not string.match(o_msg, "WTF\\Account\\.*") -- Sometimes the WTF file gets corrupted. This isn't our fault, since we weren't involved in writing it, and there's also nothing we can do about it - in fact we can't even retrieve the remnants of the old file. We may as well just ignore it. I suppose we could pop up a little dialog saying "clear some space on your hard drive, dufus" but, meh.
|
||||
|
|
Référencer dans un nouveau ticket