internetradio: stylistic improvements

remove whitespaces, use camelCase for params/args

Author: sacr1ficez

[gameplay]/internetradio/logic/gui/CRadioGUI.lua

@@ -29,7 +29,7 @@ local function initializeRadioGUI()
 	RADIO_GUI["Toggle remote speakers checkbox"] = guiCreateCheckBox(15, 345, 180, 17, "Allow other players speakers", allowRemoteSpeakers, false, RADIO_GUI["Radio window"])
 	RADIO_GUI["Toggle remote speakers label"] = guiCreateLabel(167, 345, 150, 17, "", false, RADIO_GUI["Radio window"])
 	RADIO_GUI["Radio station URL column"] = guiGridListAddColumn(RADIO_GUI["Stream URLs gridlist"], "Radio station", 0.8)
-	
+
 	guiSetVisible(RADIO_GUI["Radio window"], false)
 	guiEditSetMaxLength(RADIO_GUI["Stream URL edit"], RADIO_STREAM_URL_MAX_LENGTH)
 	guiWindowSetSizable(RADIO_GUI["Radio window"], false)

[gameplay]/internetradio/logic/handle_radio/CHandleRadio.lua

@@ -368,8 +368,8 @@ end
 addEvent("onClientCreateSpeaker", true)
 addEventHandler("onClientCreateSpeaker", root, onClientCreateSpeaker)
 
-function onClientUpdateVolume(volume)
-	setPlayerSpeakerVolume(source, volume)
+function onClientUpdateVolume(speakerVolume)
+	setPlayerSpeakerVolume(source, speakerVolume)
 end
 addEvent("onClientUpdateVolume", true)
 addEventHandler("onClientUpdateVolume", root, onClientUpdateVolume)

[gameplay]/internetradio/logic/handle_radio/SHandleRadio.lua

@@ -19,15 +19,17 @@ function setPlayerSpeakerData(playerElement, speakerData)
 	return true
 end
 
-function updateSpeakerVolume(playerElement, volume)
+function updateSpeakerVolume(playerElement, speakerVolume)
 	local playerSpeakerData = getPlayerSpeakerData(playerElement)
 
 	if (not playerSpeakerData) then
 		return false
 	end
 
-	playerSpeakerData.speakerVolume = volume
-	triggerClientEvent(root, "onClientUpdateVolume", playerElement, volume)
+	playerSpeakerData.speakerVolume = speakerVolume
+	triggerClientEvent(root, "onClientUpdateVolume", playerElement, speakerVolume)
+
+	return true
 end
 
 function getPlayerSpeakerData(playerElement)
@@ -73,7 +75,7 @@ function isObjectSpeaker(objectElement)
 		return false
 	end
 
-	for playerElement, speakerData in pairs(playerSpeakers) do
+	for _, speakerData in pairs(playerSpeakers) do
 		local speakerBox = speakerData.speakerBox
 		local matchingElement = (speakerBox == objectElement)
 
@@ -85,7 +87,7 @@ function isObjectSpeaker(objectElement)
 	return false
 end
 
-function onServerCreateSpeaker(streamURL, volume)
+function onServerCreateSpeaker(streamURL, speakerVolume)
 	if (not client) then
 		return false
 	end
@@ -102,7 +104,7 @@ function onServerCreateSpeaker(streamURL, volume)
 		return false
 	end
 
-	local validVolume = verifyRadioVolume(volume)
+	local validVolume = verifyRadioVolume(speakerVolume)
 
 	if (not validVolume) then
 		return false
@@ -134,15 +136,15 @@ function onServerCreateSpeaker(streamURL, volume)
 		speakerStreamURL = streamURL,
 		speakerSoundMaxDistance = RADIO_MAX_SOUND_DISTANCE,
 		speakerPaused = false,
-		speakerVolume = volume
+		speakerVolume = speakerVolume,
 	}
 
 	setPlayerSpeakerData(client, speakerData)
 end
 addEvent("onServerCreateSpeaker", true)
 addEventHandler("onServerCreateSpeaker", root, onServerCreateSpeaker)
 
-function onServerEditVolume(volume)
+function onServerEditVolume(speakerVolume)
 	if (not client or client ~= source) then
 		return false
 	end
@@ -153,19 +155,19 @@ function onServerEditVolume(volume)
 		return false
 	end
 
-	local validVolume = verifyRadioVolume(volume)
+	local validVolume = verifyRadioVolume(speakerVolume)
 
 	if (not validVolume) then
 		return false
 	end
-	
+
 	local speakerData = playerSpeakers[client]
 
 	if (not speakerData) then
 		return false
 	end
 
-	updateSpeakerVolume(client, volume)
+	updateSpeakerVolume(client, speakerVolume)
 end
 addEvent("onServerEditVolume", true)
 addEventHandler("onServerEditVolume", root, onServerEditVolume)

[gameplay]/internetradio/logic/handle_radio/ShHandleRadio.lua

@@ -50,6 +50,21 @@ function verifyRadioStreamURL(streamURL)
 	return true
 end
 
+function verifyRadioVolume(radioVolume)
+	local radioVolumeType = type(radioVolume)
+	local radioVolumeNumber = (radioVolumeType == "number")
+
+	if (not radioVolumeNumber) then
+		return false
+	end
+
+	local radioVolumeMin = 0
+	local radioVolumeMax = 1
+	local radioVolumeInRange = (radioVolume >= radioVolumeMin) and (radioVolume <= radioVolumeMax)
+
+	return radioVolumeInRange
+end
+
 function getPlayerFromPartialName(partialName)
 	if (not partialName) then
 		return false
@@ -127,19 +142,4 @@ end
 function clearPlayersDelay()
 	playerDelays[source] = nil
 end
-addEventHandler(isServer and "onPlayerQuit" or "onClientPlayerQuit", root, clearPlayersDelay)
-
-function verifyRadioVolume(radioVolume)
-	local radioVolumeType = type(radioVolume)
-	local radioVolumeNumber = (radioVolumeType == "number")
-
-	if (not radioVolumeNumber) then
-		return false
-	end
-
-	local radioVolumeMin = 0
-	local radioVolumeMax = 1
-	local radioVolumeInRange = (radioVolume >= radioVolumeMin) and (radioVolume <= radioVolumeMax)
-
-	return radioVolumeInRange
-end
+addEventHandler(isServer and "onPlayerQuit" or "onClientPlayerQuit", root, clearPlayersDelay)