Mercurial > wow > cyborg-mmo7
diff RatPageController.lua @ 4:d186f8cd5000
Renamed functions to avoid conflicts
author | madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09 |
---|---|
date | Mon, 28 May 2012 15:54:52 +0000 |
parents | bf9220814fb5 |
children | 6cb9a2936580 |
line wrap: on
line diff
--- a/RatPageController.lua Thu May 24 16:13:28 2012 +0000 +++ b/RatPageController.lua Mon May 28 15:54:52 2012 +0000 @@ -18,15 +18,15 @@ --~ along with this program; if not, write to the Free Software --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -RatPageController = { +CyborgMMO_RatPageController = { new = function() local self = {}; - RatPageModel.Instance().SetMode(1); + CyborgMMO_RatPageModel.Instance().SetMode(1); self.SlotClicked = function(slot) local slotObject = nil - slotObject = RatPageModel.Instance().GetObjectOnButton(slot.Id) - RatPageModel.Instance().SetObjectOnButton(slot.Id, RatPageModel.Instance().GetMode(), self.GetCursorObject()); + slotObject = CyborgMMO_RatPageModel.Instance().GetObjectOnButton(slot.Id) + CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), self.GetCursorObject()); if(slotObject ~= nil) then slotObject.Pickup(); @@ -36,14 +36,14 @@ self.ModeClicked = function(mode) msg("Setting mode "..tostring(mode.Id)); - RatPageModel.Instance().SetMode(mode.Id); + CyborgMMO_RatPageModel.Instance().SetMode(mode.Id); end self.GetCursorObject = function() local cursorObject = nil; if(nil ~= GetCursorInfo()) then local type, detail, subdetail = GetCursorInfo(); - cursorObject = WowObject.Create(type, detail, subdetail); + cursorObject = CyborgMMO_WowObject.Create(type, detail, subdetail); ClearCursor(); end return cursorObject; @@ -51,7 +51,7 @@ self.CallbackDropped = function(callbackObject) local slot = nil; - local observers = RatPageModel.Instance().GetAllObservers(); + local observers = CyborgMMO_RatPageModel.Instance().GetAllObservers(); for i = 1, (# observers) do if(MouseIsOver(observers[i])) then slot = observers[i]; @@ -59,7 +59,7 @@ end end if(nil ~= slot) then - RatPageModel.Instance().SetObjectOnButton(slot.Id, RatPageModel.Instance().GetMode(), callbackObject.wowObject); + CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), callbackObject.wowObject); end end @@ -78,9 +78,9 @@ m_Instance = nil, Instance = function() - if(nil == RatPageController.m_Instance) then - RatPageController.m_Instance = RatPageController.new(); + if(nil == CyborgMMO_RatPageController.m_Instance) then + CyborgMMO_RatPageController.m_Instance = CyborgMMO_RatPageController.new(); end - return RatPageController.m_Instance; + return CyborgMMO_RatPageController.m_Instance; end }