Merge pull request #1942 from dguzek/local-variables

change a few global Lua variables to be local
2019-12-09 20:57:22 -05:00
parent c5096d24de 9666bb0ae2
commit ced9249b01
3 changed files with 9 additions and 9 deletions
@@ -70,7 +70,7 @@ end
 -- Parses a speed mod and returns the pair (type, number) or nil if parsing
 -- failed.
 local function CanonicalizeMod(mod)
-	num = tonumber(mod:match("^(%d+.?%d*)[xX]$"))
+	local num = tonumber(mod:match("^(%d+.?%d*)[xX]$"))
 	if num ~= nil then
 		return "x", num
 	end
@@ -12,11 +12,11 @@ local tNotePositions = {
 }

 function GetTapPosition( sType )
-	bCategory = (sType == 'Standard') and 1 or 2
+	local  bCategory = (sType == 'Standard') and 1 or 2
 	-- true: Normal
 	-- false: Lower
-	bPreference = ThemePrefs.Get("NotePosition") and "Normal" or "Lower"
-	tNotePos = tNotePositions[bPreference]
+	local bPreference = ThemePrefs.Get("NotePosition") and "Normal" or "Lower"
+	local tNotePos = tNotePositions[bPreference]
 	return tNotePos[bCategory]
 end

@@ -74,13 +74,13 @@ end
 function ScreenSelectStylePositions(count)
 	local poses= {}
 	local choice_size = 192
-	
+
 	for i= 1, count do
 		local start_x = _screen.cx + ( (choice_size / 1.5) * ( i - math.ceil(count/2) ) )
 		-- The Y position depends on if the icon's index is even or odd.
 		local start_y = i % 2 == 0 and _screen.cy / 0.8 or (_screen.cy / 0.8) - (choice_size / 1.5)
 		poses[#poses+1] = {start_x, start_y}
 	end
-	
+
 	return poses
 end
@@ -12,11 +12,11 @@ local tNotePositions = {
 }

 function GetTapPosition( sType )
-	bCategory = (sType == 'Standard') and 1 or 2
+	local bCategory = (sType == 'Standard') and 1 or 2
 	-- true: Normal
 	-- false: Lower
-	bPreference = ThemePrefs.Get("NotePosition") and "Normal" or "Lower"
-	tNotePos = tNotePositions[bPreference]
+	local bPreference = ThemePrefs.Get("NotePosition") and "Normal" or "Lower"
+	local tNotePos = tNotePositions[bPreference]
 	return tNotePos[bCategory]
 end