Mercurial > wow > cyborg-mmo7

diff RatPageController.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 d186f8cd5000
children 80192bc4a108
line wrap: on
line diff
--- a/RatPageController.lua	Tue Apr 16 15:19:23 2013 +0000
+++ b/RatPageController.lua	Thu Apr 25 01:29:45 2013 +0000
@@ -1,4 +1,4 @@
---~ Warcraft Plugin for Cyborg MMO7 
+--~ Warcraft Plugin for Cyborg MMO7
 --~ Filename: RatPageController.lua
 --~ Description: Controller logic for the RatPage
 --~ Copyright (C) 2012 Mad Catz Inc.
@@ -20,67 +20,64 @@
 
 CyborgMMO_RatPageController = {
 	new = function()
-		local self = {};
-		CyborgMMO_RatPageModel.Instance().SetMode(1);
+		local self = {}
+		CyborgMMO_RatPageModel.Instance().SetMode(1)
 
 		self.SlotClicked = function(slot)
 			local slotObject = nil
 			slotObject = CyborgMMO_RatPageModel.Instance().GetObjectOnButton(slot.Id)
-			CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), self.GetCursorObject());
+			CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), self.GetCursorObject())
 
-			if(slotObject ~= nil) then
-				slotObject.Pickup();
+			if slotObject then
+				slotObject.Pickup()
 			end
-
 		end
 
 		self.ModeClicked = function(mode)
-			msg("Setting mode "..tostring(mode.Id));
-			CyborgMMO_RatPageModel.Instance().SetMode(mode.Id);
+			msg("Setting mode "..tostring(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 = CyborgMMO_WowObject.Create(type, detail, subdetail);
-				ClearCursor();
+			local cursorObject = nil
+			if GetCursorInfo() then
+				local type,detail,subdetail = GetCursorInfo()
+				cursorObject = CyborgMMO_WowObject.Create(type, detail, subdetail)
+				ClearCursor()
 			end
-			return cursorObject;
+			return cursorObject
 		end
-		
+
 		self.CallbackDropped = function(callbackObject)
-			local slot = nil;
-			local observers = CyborgMMO_RatPageModel.Instance().GetAllObservers();
-			for i = 1, (# observers) do
-				if(MouseIsOver(observers[i])) then
-					slot = observers[i];
-					break;
+			local slot = nil
+			local observers = CyborgMMO_RatPageModel.Instance().GetAllObservers()
+			for i=1,#observers do
+				if MouseIsOver(observers[i]) then
+					slot = observers[i]
+					break
 				end
 			end
-			if(nil ~= slot) then 
-				CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), callbackObject.wowObject);
+			if slot then
+				CyborgMMO_RatPageModel.Instance().SetObjectOnButton(slot.Id, CyborgMMO_RatPageModel.Instance().GetMode(), callbackObject.wowObject)
 			end
 		end
-		
-		
 
 		self.Close = function()
-
 		end
 
 		self.Open = function()
 		end
 
-		return self;
+		return self
 	end,
 
 	m_Instance = nil,
 
 	Instance = function()
-		if(nil == CyborgMMO_RatPageController.m_Instance) then
-			CyborgMMO_RatPageController.m_Instance = CyborgMMO_RatPageController.new();
+		if not CyborgMMO_RatPageController.m_Instance then
+			CyborgMMO_RatPageController.m_Instance = CyborgMMO_RatPageController.new()
 		end
-		return CyborgMMO_RatPageController.m_Instance;
-	end
+		return CyborgMMO_RatPageController.m_Instance
+	end,
 }
+