Mercurial > wow > cyborg-mmo7

diff RatPageModel.lua @ 13:6cb9a2936580

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Miscellanous Lua code consistency improvements: - no semicolon except between statements on same line - use of implicit cast to bool in if/while conditions, instead of various eq/neq against true, false or nil - no parenthesis around if/while conditions (C-ism) - avoid long function calls in if conditions - removed space in comma-separated expressions lists in multiple assignments - added spaces between arguments of functions calls - use tabs for indentation (in Lua files only) - don't reverse == in if conditions, like "if 42==foo then" (C-ism) - removed some extra parenthesis in complex expressions (C-ism) - added spaces around operators in most expressions for ease of reading - added comma after last element of table initializers - removed space after # operator - moved comment prefix of disabled code into tab (to keep disabled code aligned)
author madcatzinc@35b17cf1-18cd-47ff-9ca3-31d6b526ef09
date Thu, 25 Apr 2013 01:29:45 +0000
parents 8428fa7cf0e4
children 9f2d838d4f8e
line wrap: on
line diff
--- a/RatPageModel.lua	Tue Apr 16 15:19:23 2013 +0000
+++ b/RatPageModel.lua	Thu Apr 25 01:29:45 2013 +0000
@@ -1,4 +1,4 @@
---~ Warcraft Plugin for Cyborg MMO7 
+--~ Warcraft Plugin for Cyborg MMO7
 --~ Filename: RatPageModel.lua
 --~ Description: Code model of the MMO7 mouse
 --~ Copyright (C) 2012 Mad Catz Inc.
@@ -19,102 +19,104 @@
 --~ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 -- Constants --
 
-local RAT7 = { BUTTONS = 13, MODES = 3, SHIFT = 0}
+local RAT7 = {
+	BUTTONS = 13,
+	MODES = 3,
+	SHIFT = 0,
+}
 
-local MIDDLEMOUSE = 1;
+local MIDDLEMOUSE = 1
 
 CyborgMMO_RatPageModel = {
 	new = function()
-	local self = {}
-		self.m_Mode = 1;
-		self.ObserverCount = 0;
+		local self = {}
+		self.m_Mode = 1
+		self.ObserverCount = 0
 		self.ObserverList = {}
 		self.Data = {}
 
-		for i = 1,RAT7.MODES do
+		for i=1,RAT7.MODES do
 			self.Data[i] = {}
-			for j = 1, RAT7.BUTTONS do
-				self.Data[i][j] = {};
+			for j=1,RAT7.BUTTONS do
+				self.Data[i][j] = {}
 			end
 		end
 
 		self.InitSaveData = function(data)
-			for i = 1,RAT7.MODES do
-				if (nil == data["Rat"][i]) then
+			for i=1,RAT7.MODES do
+				if not data["Rat"][i] then
 					data["Rat"][i] = {}
 				end
-				for j = 1, RAT7.BUTTONS do
-					if (nil == data["Rat"][i][j]) then
+				for j=1,RAT7.BUTTONS do
+					if not data["Rat"][i][j] then
 						data["Rat"][i][j] = {}
 					end
 				end
 			end
 		end
 
-
 		self.LoadData = function()
 			msg("Loading...")
-			local data = CyborgMMO_GetSaveData();
+			local data = CyborgMMO_GetSaveData()
 
-
-			if (nil == data["Rat"]) then
+			if not data["Rat"] then
 				data["Rat"] = {}
-				self.InitSaveData(data);
+				self.InitSaveData(data)
 			end
 
 			self.Data = data["Rat"]
-			if(data ~= nil) then
-				for mode = 1,RAT7.MODES do
-					for button = 1, RAT7.BUTTONS do
-						if(self.Data[mode][button] ~= nil) then
-							object = CyborgMMO_WowObject.Create(self.Data[mode][button].Type, self.Data[mode][button].Detail, self.Data[mode][button].Subdetail);
-							self.SetObjectOnButtonNoUpdate(button, mode, object);
+			if data then
+				for mode=1,RAT7.MODES do
+					for button=1,RAT7.BUTTONS do
+						if self.Data[mode][button] then
+							object = CyborgMMO_WowObject.Create(self.Data[mode][button].Type, self.Data[mode][button].Detail, self.Data[mode][button].Subdetail)
+							self.SetObjectOnButtonNoUpdate(button, mode, object)
 						else
-							object = CyborgMMO_WowObject.Create("", "", "");
-							self.SetObjectOnButtonNoUpdate(button, mode, object);
-							self.Data[mode][button] = object;
+							object = CyborgMMO_WowObject.Create("", "", "")
+							self.SetObjectOnButtonNoUpdate(button, mode, object)
+							self.Data[mode][button] = object
 						end
 					end
 				end
-				self.UpdateObservers();
+				self.UpdateObservers()
 			end
 		end
 
 		self.SaveData = function()
 			msg("Saving...")
-			CyborgMMO_SetSaveData(self.Data, "Rat");
+			CyborgMMO_SetSaveData(self.Data, "Rat")
 		end
 
 		self.SetMode = function(mode)
-			self.m_Mode = mode;
-			self.UpdateObservers();
+			self.m_Mode = mode
+			self.UpdateObservers()
 		end
 
 		self.GetMode = function()
-			return self.m_Mode;
+			return self.m_Mode
 		end
 
 		self.GetData = function()
-			return self.Data, self.m_Mode;
+			return self.Data,self.m_Mode
 		end
 
 		self.GetObjectOnButton = function(button)
-			if(nil == self.Data[self.m_Mode][button]) then
-				return nil;
+			if not self.Data[self.m_Mode][button] then
+				return nil
 			else
 				return self.Data[self.m_Mode][button]
 			end
 		end
 
 		self.SetObjectOnButtonNoUpdate = function(button, mode, object)
-			--msg("button = "..tostring(button).." mode = "..tostring(mode))
-			self.Data[mode][button] = object;
+		--	msg("button = "..tostring(button).." mode = "..tostring(mode))
+			self.Data[mode][button] = object
 
-			if(nil ~= object) then
-				object.SetBinding(CyborgMMO_WowCommands[((mode-1)*RAT7.BUTTONS)+button]);
+			if object then
+				object.SetBinding(CyborgMMO_WowCommands[((mode-1)*RAT7.BUTTONS)+button])
 				if("callback" == object.Type) then
 					msg("trying to set texture")
-					local slot = getglobal("CyborgMMO_MainPageSlotListSlot"..button);
+					local slot = getglobal("CyborgMMO_MainPageSlotListSlot"..button)
 					slot:SetNormalTexture(object.Texture)
 				end
 			else
@@ -124,34 +126,36 @@
 		end
 
 		self.SetObjectOnButton = function(button, mode, object)
-			self.SetObjectOnButtonNoUpdate(button, mode, object);
+			self.SetObjectOnButtonNoUpdate(button, mode, object)
 			self.UpdateObservers()
 		end
 
 		self.AddObserver = function(view)
-			table.insert(self.ObserverList,view)
-			self.observerCount = # self.ObserverList
+			table.insert(self.ObserverList, view)
+			self.observerCount = #self.ObserverList
 		end
-		
+
 		self.GetAllObservers = function()
-			return self.ObserverList;
+			return self.ObserverList
 		end
 
 		self.UpdateObservers = function()
-			for i = 1, (# self.ObserverList) do
+			for i=1,#self.ObserverList do
 				self.ObserverList[i].Update(self.Data, self.m_Mode)
 			end
 			self.SaveData()
 		end
-	return self;
+
+		return self
 	end,
 
 	m_Instance = nil,
 
 	Instance = function()
-		if(nil == CyborgMMO_RatPageModel.m_Instance) then
-			CyborgMMO_RatPageModel.m_Instance = CyborgMMO_RatPageModel.new();
+		if not CyborgMMO_RatPageModel.m_Instance then
+			CyborgMMO_RatPageModel.m_Instance = CyborgMMO_RatPageModel.new()
 		end
-		return CyborgMMO_RatPageModel.m_Instance;
-	end
+		return CyborgMMO_RatPageModel.m_Instance
+	end,
 }
+