Addendum to 25d4a4f (indentation fix)

Author: Dutchman101

[gameplay]/voice_local/client.lua

@@ -5,7 +5,7 @@ local streamedPlayers = {}
 local fDistDiff = fMinDistance - fMaxDistance
 
 local sx, sy = guiGetScreenSize()
-local nx, ny = sx/1920, sy/1080
+local nx, ny = sx / 1920, sy / 1080
 
 local width = 108 * nx
 local height = 180 * ny
@@ -18,7 +18,7 @@ local icon = dxCreateTexture("icon.png", "dxt5", true, "clamp")
 
 function preRender()
     local x, y, z, lx, ly, lz = getCameraMatrix()
-	
+
     for player, talking in pairs(streamedPlayers) do
         if player and isElement(player) and getElementType(player) == "player" then
             local x1, y1, z1 = getElementPosition(player)
@@ -33,7 +33,7 @@ function preRender()
                 fVolume = mathexp(-(fDistance - fMinDistance) * (5.0 / fDistDiff)) * 100
             end
 
-			if isLineOfSightClear(x, y, z, x1, y1, z1, false, false, false, false, true, true, true, localPlayer) then
+            if isLineOfSightClear(x, y, z, x1, y1, z1, false, false, false, false, true, true, true, localPlayer) then
                 setSoundVolume(player, fVolume)
                 setSoundEffectEnabled(player, "compressor", false)
             else
@@ -45,7 +45,7 @@ function preRender()
                 local boneX, boneY, boneZ = getPedBonePosition(player, 8)
                 local screenX, screenY = getScreenFromWorldPosition(boneX, boneY, boneZ + 0.5)
                 if screenX and screenY and fDistance < fMaxDistance then
-                    fDistance = 1/fDistance
+                    fDistance = 1 / fDistance
                     dxDrawImage(screenX - halfWidth * fDistance, screenY - halfHeight * fDistance, width * fDistance, height * fDistance, icon, 0, 0, 0, -1, false)
                 end
             end
@@ -55,12 +55,12 @@ end
 addEventHandler("onClientPreRender", root, preRender)
 
 function onStart()
-	local x, y, z = getElementPosition(localPlayer)
-	for _, player in ipairs(getElementsWithinRange(x, y, z, 250, "player")) do
-		if streamedPlayers[player] == nil then
-			streamedPlayers[player] = false
-		end
-	end
+    local x, y, z = getElementPosition(localPlayer)
+    for _, player in ipairs(getElementsWithinRange(x, y, z, 250, "player")) do
+        if streamedPlayers[player] == nil then
+            streamedPlayers[player] = false
+        end
+    end
     triggerServerEvent("voice:setPlayerBroadcast", resourceRoot, localPlayer, streamedPlayers)
 end
 addEventHandler("onClientResourceStart", resourceRoot, onStart, false)
@@ -76,15 +76,14 @@ end
 addEventHandler("onClientPlayerJoin", root, playerJoin)
 
 function playerQuit()
-	if streamedPlayers[source] ~= nil then
-		streamedPlayers[source] = nil
-		setSoundVolume(source, 0)
-		triggerServerEvent("voice:removePlayerBroadcast", resourceRoot, localPlayer, source)
+    if streamedPlayers[source] ~= nil then
+        streamedPlayers[source] = nil
+        setSoundVolume(source, 0)
+        triggerServerEvent("voice:removePlayerBroadcast", resourceRoot, localPlayer, source)
     end
 end
 addEventHandler("onClientPlayerQuit", root, playerQuit)
 
-
 -- Code considers this event's problem @ "Note" box: https://wiki.multitheftauto.com/wiki/OnClientElementStreamIn
 -- It should be modified if said behavior ever changes
 function streamIn()
@@ -97,7 +96,6 @@ function streamIn()
 end
 addEventHandler("onClientElementStreamIn", root, streamIn)
 
-
 -- To ensure table integrity, stream out & local player death into 2 separate, safer events
 -- See the "Note" box at https://wiki.multitheftauto.com/wiki/OnClientElementStreamIn for reason why
 -- Stream out event
@@ -114,10 +112,10 @@ addEventHandler("onClientElementStreamOut", root, streamOut)
 
 -- Local player death event
 function onWasted()
-	if streamedPlayers[localPlayer] ~= nil then
-		streamedPlayers[localPlayer] = nil
-		setSoundVolume(localPlayer, 0)
-		triggerServerEvent("voice:removePlayerBroadcast", resourceRoot, localPlayer, localPlayer)
+    if streamedPlayers[localPlayer] ~= nil then
+        streamedPlayers[localPlayer] = nil
+        setSoundVolume(localPlayer, 0)
+        triggerServerEvent("voice:removePlayerBroadcast", resourceRoot, localPlayer, localPlayer)
     end
 end
 addEventHandler("onClientPlayerWasted", localPlayer, onWasted)
@@ -129,29 +127,29 @@ end
 addEventHandler("onClientResourceStop", resourceRoot, resourceStop, false)
 
 function voiceStart(source)
-	if (isElement(source) and getElementType(source) == "player") then
-		if streamedPlayers[source] ~= nil then
-			streamedPlayers[source] = true
-		end
-	end
+    if (isElement(source) and getElementType(source) == "player") then
+        if streamedPlayers[source] ~= nil then
+            streamedPlayers[source] = true
+        end
+    end
 end
 addEvent("voice_cl:onClientPlayerVoiceStart", true)
 addEventHandler("voice_cl:onClientPlayerVoiceStart", resourceRoot, voiceStart)
 
 function voiceStop(source)
-	if (isElement(source) and getElementType(source) == "player") then
-		if streamedPlayers[source] ~= nil then
-			streamedPlayers[source] = false
-		end
-	end
+    if (isElement(source) and getElementType(source) == "player") then
+        if streamedPlayers[source] ~= nil then
+            streamedPlayers[source] = false
+        end
+    end
 end
 addEvent("voice_cl:onClientPlayerVoiceStop", true)
 addEventHandler("voice_cl:onClientPlayerVoiceStop", resourceRoot, voiceStop)
 
 function table.empty(a)
-	if type(a) ~= "table" then
-		return false
-	end
+    if type(a) ~= "table" then
+        return false
+    end
 
-	return next(a) == nil
+    return next(a) == nil
 end

[gameplay]/voice_local/server.lua

@@ -1,11 +1,11 @@
 local broadcasts = {}
 
 function setPlayerBroadcast(thePlayer, players)
-	broadcasts[thePlayer] = {}
+    broadcasts[thePlayer] = {}
 
-	for player, _ in pairs(players) do
-		table.insert(broadcasts[thePlayer], player)
-	end
+    for player, _ in pairs(players) do
+        table.insert(broadcasts[thePlayer], player)
+    end
 
     setPlayerVoiceBroadcastTo(thePlayer, broadcasts[thePlayer])
 end
@@ -58,15 +58,15 @@ addEvent("voice:removePlayerBroadcast", true)
 addEventHandler("voice:removePlayerBroadcast", resourceRoot, removePlayerBroadcast)
 
 function playerVoiceStart()
-	for _, listener in ipairs(broadcasts[source]) do
-		triggerClientEvent(listener, "voice_cl:onClientPlayerVoiceStart", resourceRoot, source)
-	end
+    for _, listener in ipairs(broadcasts[source]) do
+        triggerClientEvent(listener, "voice_cl:onClientPlayerVoiceStart", resourceRoot, source)
+    end
 end
 addEventHandler("onPlayerVoiceStart", root, playerVoiceStart)
 
 function playerVoiceStop()
-	for _, listener in ipairs(broadcasts[source]) do
-		triggerClientEvent(listener, "voice_cl:onClientPlayerVoiceStop", resourceRoot, source)
-	end
+    for _, listener in ipairs(broadcasts[source]) do
+        triggerClientEvent(listener, "voice_cl:onClientPlayerVoiceStop", resourceRoot, source)
+    end
 end
 addEventHandler("onPlayerVoiceStop", root, playerVoiceStop)