comparison ActionButton.lua @ 295:0cb6a9944497 1.1 alpha 11 (5.04 bandaid)

Quick hacks for 5.04 - disable hiding VehicleMenuBar frame, whose name changed - GetMultiCastBarOffset() -> GetMultiCastBarIndex()... cleanup before totem bar support is purged - Remove totem bar - fix demon form, vehicle buttons, overridebar buttons (cross fingers) - change possess/vehicle order priority
author Flick
date Tue, 11 Sep 2012 16:50:37 -0700
parents 276165a0e860
children f7a5676c9517
comparison
equal deleted inserted replaced
293:7c596a5951ee 295:0cb6a9944497
44 local action = nil 44 local action = nil
45 if (doVehicle and mcVehicleState == "vehicle") or 45 if (doVehicle and mcVehicleState == "vehicle") or
46 (doMindControl and mcVehicleState == "mc") then 46 (doMindControl and mcVehicleState == "mc") then
47 local idx = self:GetAttribute("bar-idx") 47 local idx = self:GetAttribute("bar-idx")
48 local maxN = (doVehicle and mcVehicleState == "vehicle") and 7 or 12 48 local maxN = (doVehicle and mcVehicleState == "vehicle") and 7 or 12
49 local pageIndex = (doVehicle and mcVehicleState == "vehicle") and 12 or 14
49 if idx and idx <= maxN then 50 if idx and idx <= maxN then
50 action = 120 + idx 51 action = 12*(pageIndex-1) + idx
51 else 52 else
52 action = 0 53 action = 0
53 end 54 end
54 elseif state and settings[state] and settings[state].page then 55 elseif state and settings[state] and settings[state].page then
55 action = self:GetAttribute("action-"..settings[state].page) 56 action = self:GetAttribute("action-"..settings[state].page)
640 doVehicle = self:GetAttribute("vehicle") 641 doVehicle = self:GetAttribute("vehicle")
641 control:ChildUpdate() 642 control:ChildUpdate()
642 ]]) 643 ]])
643 644
644 f:SetAttribute("_onstate-mc", _onstate_mc) 645 f:SetAttribute("_onstate-mc", _onstate_mc)
645 RegisterStateDriver(f, "mc", "[vehicleui] vehicle; [bonusbar:5] mc; none") 646 RegisterStateDriver(f, "mc", "[vehicleui] vehicle; [overridebar] mc; none")
646 647
647 f:SetAttribute("lockbuttons",config.lockButtons) 648 f:SetAttribute("lockbuttons",config.lockButtons)
648 f:SetAttribute("lockbuttonscombat",config.lockButtonsCombat) 649 f:SetAttribute("lockbuttonscombat",config.lockButtonsCombat)
649 f:Execute( 650 f:Execute(
650 [[ 651 [[