Everything SEEMS to work, less of course the db. Something I did before screwed everything up.
I implemented a QuestHelper_GetTime function for the next time Blizzard decides to fiddle with the time functions. It returns debugprofilestop() / 1000, to exactly match the precision of GetTime(). I also re-removed references to Cartographer from the rollback.
Cette révision appartient à :
Parent
e4873f0d6c
révision
965e8589c9
|
@ -1,3 +1,5 @@
|
|||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["arrow.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["arrow.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
QuestHelper_File["bst_astrolabe.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["bst_astrolabe.lua"] = GetTime()
|
|
@ -1,2 +0,0 @@
|
|||
QuestHelper_File["bst_ctl.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["bst_ctl.lua"] = GetTime()
|
|
@ -1,2 +0,0 @@
|
|||
QuestHelper_File["bst_libaboutpanel.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["bst_libaboutpanel.lua"] = GetTime()
|
|
@ -1,2 +0,0 @@
|
|||
QuestHelper_File["bst_post.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["bst_post.lua"] = GetTime()
|
|
@ -1,2 +0,0 @@
|
|||
QuestHelper_File["bst_range.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["bst_range.lua"] = GetTime()
|
|
@ -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
|
|
@ -1,31 +0,0 @@
|
|||
-- QuestHelper_File["cartographer_is_terrible.lua"] = "4.0.1.$svnversion$"
|
||||
-- QuestHelper_Loadtime["cartographer_is_terrible.lua"] = GetTime()
|
||||
|
||||
-- http://gunnerkrigg.wikia.com/wiki/Category:Terrible
|
||||
|
||||
-- if Cartographer and Cartographer.SetCurrentInstance and Cartographer_InstanceMaps and Cartographer_InstanceMaps.OnEnable then
|
||||
-- local nop = function () end
|
||||
|
||||
-- function hookitsbrainsout(name)
|
||||
-- local oldfunc = _G[name]
|
||||
-- _G[name] = function(...)
|
||||
-- local temp = WorldMapLevelDropDown_Update
|
||||
-- WorldMapLevelDropDown_Update = nop -- YOINK
|
||||
-- oldfunc(...)
|
||||
-- WorldMapLevelDropDown_Update = temp -- KNIOY
|
||||
-- end
|
||||
-- end
|
||||
|
||||
-- local oldenable = Cartographer_InstanceMaps.OnEnable
|
||||
-- function Cartographer_InstanceMaps:OnEnable(...)
|
||||
-- oldenable(self, ...)
|
||||
|
||||
-- hookitsbrainsout("SetMapZoom")
|
||||
-- hookitsbrainsout("SetMapToCurrentZone")
|
||||
-- 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.
|
||||
-- The top two bugs on the Cartographer tracker are both this one, as well as a third bug listed later down. I've talked to both of the possibly-main Cartographer maintainers about fixing it, neither are interested. It's pretty clearly not going to be fixed.
|
||||
-- So here's a hack. The problem is the WorldMapLevelDropDown_Update call which, after a few nested calls, is eventually called. Why's it there? I dunno. What will removing it break? Not a clue. This cute little hook automatically disables it during the call of the important functions. Will this be a problem for Cartographer? Damned if I know. Will it be *my* problem? No! No it will not.
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_achievement.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_achievement.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_bitstream.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_bitstream.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_equip.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_equip.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_flight.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_flight.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_hearth.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_hearth.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_item.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_item.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_location.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_location.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_loot.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_loot.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_lzw.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_lzw.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_merchant.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_merchant.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_merger.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_merger.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_monster.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_monster.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_notifier.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_notifier.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_object.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_object.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_patterns.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_patterns.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_quest.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_quest.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_spec.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_spec.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_traveled.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_traveled.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_upgrade.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_upgrade.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_util.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_util.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_warp.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_warp.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["collect_zone.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["collect_zone.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["comm.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["comm.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["config.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["config.lua"] = GetTime()
|
||||
|
||||
|
@ -927,35 +930,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",
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["core.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["core.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["custom.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["custom.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["db_get.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["db_get.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["director_achievement.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["director_achievement.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["director_find.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["director_find.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
QuestHelper_File["director_quest.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["director_quest.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["dodads.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["dodads.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["dodads_triangles.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["dodads_triangles.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -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.
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["filter_base.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["filter_base.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["filter_core.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["filter_core.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["flightpath.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["flightpath.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["graph_core.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["graph_core.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["graph_flightpath.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["graph_flightpath.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["help.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["help.lua"] = GetTime()
|
||||
|
||||
|
@ -437,25 +440,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 +756,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},
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
QuestHelper_File["main.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["main.lua"] = GetTime()
|
||||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
local version_string = QuestHelper_File["main.lua"] -- we pretty much save this only so we can inform the user that they're using a beta version
|
||||
|
||||
-- Just to make sure it's always 'seen' (there's nothing that can be seen, but still...), and therefore always updating.
|
||||
|
@ -42,7 +43,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 +176,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
|
||||
|
@ -212,11 +210,6 @@ QH_Event("ADDON_LOADED", function (addonid)
|
|||
local expected_files =
|
||||
{
|
||||
["bst_pre.lua"] = true,
|
||||
["bst_post.lua"] = true,
|
||||
["bst_astrolabe.lua"] = true,
|
||||
["bst_ctl.lua"] = true,
|
||||
["bst_libaboutpanel.lua"] = true,
|
||||
["bst_range.lua"] = true,
|
||||
|
||||
["manager_event.lua"] = true,
|
||||
["manager_achievement.lua"] = true,
|
||||
|
@ -243,7 +236,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,
|
||||
|
@ -538,10 +530,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
|
||||
|
@ -616,12 +604,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"] = GetTime()
|
||||
|
@ -921,13 +903,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
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["manager_achievement.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["manager_achievement.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["manager_completed.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["manager_completed.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["manager_event.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["manager_event.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["mapbutton.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["mapbutton.lua"] = GetTime()
|
||||
|
||||
|
@ -31,12 +34,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,13 +250,7 @@ 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
|
||||
-- put it in the upper right corner
|
||||
button:SetPoint("TOPRIGHT", WorldMapButton, "TOPRIGHT", -10, -10)
|
||||
button:SetFrameLevel(WorldMapButton:GetFrameLevel()+1)
|
||||
button:SetFrameStrata("FULLSCREEN")
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["menu.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["menu.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["nag.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["nag.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["objective.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["objective.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["objtips.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["objtips.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["pathfinding.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["pathfinding.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["pattern.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["pattern.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["quest.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["quest.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["radar.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["radar.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["recycle.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["recycle.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["routing.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["routing.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["routing_controller.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["routing_controller.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["routing_core.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["routing_core.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["routing_debug.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["routing_debug.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["routing_hidden.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["routing_hidden.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["routing_loc.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["routing_loc.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["routing_route.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["routing_route.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["teleport.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["teleport.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["textviewer.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["textviewer.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["timeslice.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["timeslice.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["tomtom.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["tomtom.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["tooltip.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["tooltip.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["tracker.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["tracker.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["upgrade.lua"] = "4.0.1.$svnversion$"
|
||||
local my_version = QuestHelper_File["upgrade.lua"]
|
||||
|
||||
|
@ -371,12 +374,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 +469,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
|
||||
|
|
|
@ -1,3 +1,9 @@
|
|||
function QuestHelper_GetTime()
|
||||
return debugprofilestop() / 1000
|
||||
end
|
||||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["utility.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["utility.lua"] = GetTime()
|
||||
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
|
||||
local GetTime = QuestHelper_GetTime
|
||||
|
||||
QuestHelper_File["warning.lua"] = "4.0.1.$svnversion$"
|
||||
QuestHelper_Loadtime["warning.lua"] = GetTime()
|
||||
|
||||
|
@ -241,7 +244,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