Mercurial > wow > reaction

changeset 231:158c9299185b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix button type config lookup
author Flick
date Tue, 22 Mar 2011 11:35:04 -0700
parents 98114c158e62
children afb5ff4eccc0
files ReAction.lua classes/ActionButton.lua classes/BagButton.lua classes/Button.lua classes/MultiCastButton.lua classes/PetActionButton.lua classes/StanceButton.lua classes/VehicleExitButton.lua
diffstat 8 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ReAction.lua	Tue Mar 22 11:14:21 2011 -0700
+++ b/ReAction.lua	Tue Mar 22 11:35:04 2011 -0700
@@ -305,7 +305,7 @@
 end
 
 function ReAction:RegisterBarType( class, isDefault )
-  local name = class:GetBarType()
+  local name = class:GetButtonTypeID()
   self.barTypes[name] = class
   if isDefault then
     self.defaultBarType = name
--- a/classes/ActionButton.lua	Tue Mar 22 11:14:21 2011 -0700
+++ b/classes/ActionButton.lua	Tue Mar 22 11:35:04 2011 -0700
@@ -184,7 +184,8 @@
       buttons = { },
     },
 
-    barType = L["Action Bar"]
+    barType = L["Action Bar"],
+    buttonTypeID = buttonTypeID
   },
   { __index = Super } )
 
--- a/classes/BagButton.lua	Tue Mar 22 11:14:21 2011 -0700
+++ b/classes/BagButton.lua	Tue Mar 22 11:35:04 2011 -0700
@@ -30,6 +30,7 @@
     },
 
     barType = L["Bag Bar"],
+    buttonTypeID = buttonTypeID
   },
   { __index = Super } )
 
--- a/classes/Button.lua	Tue Mar 22 11:14:21 2011 -0700
+++ b/classes/Button.lua	Tue Mar 22 11:35:04 2011 -0700
@@ -124,6 +124,10 @@
   return self.barType
 end
 
+function Button:GetButtonTypeID()
+  return self.buttonTypeID
+end
+
 function Button:GetConfig()
   return self.config
 end
--- a/classes/MultiCastButton.lua	Tue Mar 22 11:14:21 2011 -0700
+++ b/classes/MultiCastButton.lua	Tue Mar 22 11:35:04 2011 -0700
@@ -316,6 +316,7 @@
     },
 
     barType = L["Totem Bar"], 
+    buttonTypeID = buttonTypeID
   },
   { __index = Action } )
 
--- a/classes/PetActionButton.lua	Tue Mar 22 11:14:21 2011 -0700
+++ b/classes/PetActionButton.lua	Tue Mar 22 11:35:04 2011 -0700
@@ -71,6 +71,7 @@
     },
 
     barType = L["Pet Action Bar"], 
+    buttonTypeID = buttonTypeID
   },
   { __index = Super } )
 
--- a/classes/StanceButton.lua	Tue Mar 22 11:14:21 2011 -0700
+++ b/classes/StanceButton.lua	Tue Mar 22 11:35:04 2011 -0700
@@ -45,6 +45,7 @@
     }, 
 
     barType = L["Stance Bar"], 
+    buttonTypeID = buttonTypeID
   },
   { __index = Super } )
 
--- a/classes/VehicleExitButton.lua	Tue Mar 22 11:14:21 2011 -0700
+++ b/classes/VehicleExitButton.lua	Tue Mar 22 11:35:04 2011 -0700
@@ -21,6 +21,7 @@
     },
 
     barType = L["Exit Vehicle Floater"], 
+    buttonTypeID = buttonTypeID
   }, 
   { __index = Super } )