Quantcast

taxi update

Munglunch [03-16-15 - 20:31]
taxi update
Filename
SVUI_!Core/system/_reports/guild.lua
SVUI_!Core/system/overrides.lua
diff --git a/SVUI_!Core/system/_reports/guild.lua b/SVUI_!Core/system/_reports/guild.lua
index d5f0340..530a41e 100644
--- a/SVUI_!Core/system/_reports/guild.lua
+++ b/SVUI_!Core/system/_reports/guild.lua
@@ -298,7 +298,9 @@ Report.OnEnter = function(self)

 		local zoneColor, classColor, questColor, member, groupFormat;
 		local counter = 0;
+
 		Reports.ToolTip:AddLine(' ')
+
 		for X = 1, #GuildStatMembers do
 			if((30 - counter) <= 1) then
 				if((online - 30) > 1) then
diff --git a/SVUI_!Core/system/overrides.lua b/SVUI_!Core/system/overrides.lua
index 6988b2d..dcb6554 100644
--- a/SVUI_!Core/system/overrides.lua
+++ b/SVUI_!Core/system/overrides.lua
@@ -824,14 +824,26 @@ local Dura_OnSetPoint = function(self, _, parent)
 	end
 end

+local BailOut_OnHook = function()
+	SVUI_BailOut:Show()
+end
+
 local BailOut_OnEvent = function(self, event, ...)
-	if((event == "UNIT_ENTERED_VEHICLE" and CanExitVehicle()) or UnitControllingVehicle("player") or UnitInVehicle("player")) then
+	if((event == "UNIT_ENTERED_VEHICLE" and CanExitVehicle()) or UnitControllingVehicle("player") or UnitInVehicle("player") or UnitOnTaxi("player")) then
  		self:Show()
  	else
  		self:Hide()
  	end
 end

+local BailOut_OnClick = function(self, event, ...)
+	if(UnitOnTaxi("player")) then
+ 		TaxiRequestEarlyLanding()
+ 	else
+ 		VehicleExit()
+ 	end
+end
+
 local function AlterBlizzMainBar()
 	if(not SV.ActionBars and MainMenuBar) then
 		MainMenuBar:ClearAllPoints()
@@ -942,12 +954,13 @@ local function SetOverrides()
 	SVUI_BailOut:SetHighlightTexture(SV.media.icon.exitIcon)
 	SVUI_BailOut:SetStyle("!_Frame", "Transparent")
 	SVUI_BailOut:RegisterForClicks("AnyUp")
-	SVUI_BailOut:SetScript("OnClick", VehicleExit)
+	SVUI_BailOut:SetScript("OnClick", BailOut_OnClick)
 	SVUI_BailOut:RegisterEvent("UNIT_ENTERED_VEHICLE")
  	SVUI_BailOut:RegisterEvent("UNIT_EXITED_VEHICLE")
  	SVUI_BailOut:RegisterEvent("VEHICLE_UPDATE")
  	SVUI_BailOut:RegisterEvent("PLAYER_ENTERING_WORLD")
  	SVUI_BailOut:SetScript("OnEvent", BailOut_OnEvent)
+ 	NewHook("TakeTaxiNode", BailOut_OnHook)
 	SV:NewAnchor(SVUI_BailOut, L["Bail Out"])
 	SVUI_BailOut:Hide()