Skip to content

Commit a298832

Browse files
authored
various: replace remaining getLocalPlayer function calls (#660)
1 parent 385c518 commit a298832

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

[gamemodes]/[briefcaserace]/briefcaserace/client/br.client.driveby.lua

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ function toggleDriveBy()
2424
-- Stolen from wiki --
2525
----------------------
2626
-- we check if local player isn't currently doing a gang driveby
27-
if not isPedDoingGangDriveby ( getLocalPlayer () ) then
27+
if not isPedDoingGangDriveby ( localPlayer ) then
2828
-- if he got driveby mode off, turn it on
29-
setPedWeaponSlot ( getLocalPlayer (), 4 )
30-
setPedDoingGangDriveby ( getLocalPlayer (), true )
29+
setPedWeaponSlot ( localPlayer, 4 )
30+
setPedDoingGangDriveby ( localPlayer, true )
3131
else
3232
-- otherwise, turn it off
33-
setPedWeaponSlot ( getLocalPlayer (), 0 )
34-
setPedDoingGangDriveby ( getLocalPlayer (), false )
33+
setPedWeaponSlot ( localPlayer, 0 )
34+
setPedDoingGangDriveby ( localPlayer, false )
3535
end
3636
----------------------
3737
end

[gamemodes]/[stealth]/stealth/noisebar.lua

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ function reducesoundlevel ()
5757
guiProgressBarSetProgress ( thesoundbar, barlevel )
5858
-- guiSetVisible ( thesoundbar, true )
5959
smoothfade = setTimer ( smoothreduce, 100, 9 )
60-
setElementData ( getLocalPlayer (), "noiselevel", soundlevel )
60+
setElementData ( localPlayer, "noiselevel", soundlevel )
6161
if soundlevel > 0 then
6262
if blipshowing == 0 then
63-
local isDead = isPedDead(getLocalPlayer ())
63+
local isDead = isPedDead(localPlayer)
6464
if (isDead == false) then
6565
blipshowing = 1
6666
end
@@ -94,11 +94,11 @@ function damagenoise ( attacker, weapon, bodypart, loss )
9494
if ( bodypart ~= 7 ) and ( bodypart ~= 8 ) then
9595
return
9696
end
97-
local isplayerlimping = getElementData ( getLocalPlayer (), "legdamage" )
97+
local isplayerlimping = getElementData ( localPlayer, "legdamage" )
9898
if isplayerlimping ~= 1 then
9999
if (attacker) then
100100
local attackerteam = getPlayerTeam (attacker)
101-
local yourteam = getPlayerTeam (getLocalPlayer ())
101+
local yourteam = getPlayerTeam (localPlayer)
102102
if attackerteam == yourteam then
103103
if getTeamFriendlyFire ( yourteam ) == false then
104104
--do nothing
@@ -109,7 +109,7 @@ function damagenoise ( attacker, weapon, bodypart, loss )
109109
--outputChatBox("You've been hit in the leg.", 255, 69, 0)
110110
setPedAnimation ( localPlayer, "ped", bodyPartAnim[bodypart][1], true, true, false )
111111
setTimer ( setPedAnimation, 600, 1, localPlayer )
112-
setElementData ( getLocalPlayer (), "legdamage", 1 )
112+
setElementData ( localPlayer, "legdamage", 1 )
113113
--Blood stuff
114114
local function blood()
115115
local boneX,boneY,boneZ = getPedBonePosition(localPlayer, bodyPartAnim[bodypart][2])
@@ -126,7 +126,7 @@ function damagenoise ( attacker, weapon, bodypart, loss )
126126
end
127127

128128
function readddamage ()
129-
-- addEventHandler ( "onClientPedDamage", getLocalPlayer (), damagenoise )
129+
-- addEventHandler ( "onClientPedDamage", localPlayer, damagenoise )
130130
end
131131

132132

@@ -169,10 +169,10 @@ end
169169
--LIMP TIMING
170170

171171
function limpeffect ( source, key, keystate )
172-
if isPedInVehicle (getLocalPlayer ()) then
172+
if isPedInVehicle (localPlayer) then
173173
return
174174
else
175-
islimping = getElementData ( getLocalPlayer (), "legdamage" )
175+
islimping = getElementData ( localPlayer, "legdamage" )
176176
if islimping == 1 then
177177
local makeplayerlimp = setTimer ( limpeffectparttwo , 200, 1, source, key, state )
178178
if lookingthroughcamera ~= 1 then
@@ -186,10 +186,10 @@ function limpeffect ( source, key, keystate )
186186
end
187187

188188
function limpeffectparttwo ( source, key, keystate )
189-
if isPedInVehicle (getLocalPlayer ()) then
189+
if isPedInVehicle (localPlayer) then
190190
return
191191
else
192-
islimping = getElementData ( getLocalPlayer (), "legdamage" )
192+
islimping = getElementData ( localPlayer, "legdamage" )
193193
if islimping == 1 then
194194
local makeplayerlimp = setTimer ( limpeffect, 500, 1, source, key, state )
195195
if lookingthroughcamera ~= 1 then
@@ -205,9 +205,9 @@ function limpeffectparttwo ( source, key, keystate )
205205
end
206206

207207
function startalimp ()
208-
local theplayer = getLocalPlayer ()
208+
local theplayer = localPlayer
209209
if (getPedArmor ( theplayer )) == 0 then
210-
setElementData ( getLocalPlayer (), "legdamage", 1 )
210+
setElementData ( localPlayer, "legdamage", 1 )
211211
local makeplayerlimp = setTimer ( limpeffect, 300, 1, source, key, state )
212212
end
213213
end
@@ -216,7 +216,7 @@ addCommandHandler ( "crippleme", startalimp )
216216

217217

218218
function movementcheck ( source, key, keystate )
219-
if ( isPedDucked ( getLocalPlayer () ) ) == false then
219+
if ( isPedDucked ( localPlayer ) ) == false then
220220
if ( getPedControlState ( "sprint" ) ) then
221221
soundlevel = soundlevel +1
222222
end
@@ -245,8 +245,8 @@ function hidesoundbar ( theresource )
245245
guiSetVisible ( thesoundbar, false )
246246
end
247247

248-
addEventHandler ( "onClientPlayerWasted", getLocalPlayer (), hidesoundbar )
249-
addEventHandler ( "onClientPlayerDamage", getLocalPlayer (), damagenoise )
250-
addEventHandler ( "onClientPlayerWeaponFire", getLocalPlayer (), shootingnoise )
251-
addEventHandler ( "onClientPlayerSpawn", getLocalPlayer (), setupsoundstuff )
248+
addEventHandler ( "onClientPlayerWasted", localPlayer, hidesoundbar )
249+
addEventHandler ( "onClientPlayerDamage", localPlayer, damagenoise )
250+
addEventHandler ( "onClientPlayerWeaponFire", localPlayer, shootingnoise )
251+
addEventHandler ( "onClientPlayerSpawn", localPlayer, setupsoundstuff )
252252
addEventHandler ( "onClientResourceStart", resourceRoot, setuptrigger)

[gamemodes]/[stealth]/stealth/stealthmain_client.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ end
388388
function cleanup (theresource)
389389
thisone = getThisResource()
390390
if theresource == thisone then
391-
setElementAlpha ( getLocalPlayer (), 255 )
391+
setElementAlpha ( localPlayer, 255 )
392392
timers = getTimers()
393393
for timerKey, timerValue in ipairs(timers) do
394394
killTimer ( timerValue )

[web]/performancebrowser/performancebrowser_client.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
--
55
--
66

7-
me = getLocalPlayer ()
7+
me = localPlayer
88
local bSupportsStats = getPerformanceStats ~= nil
99

1010
addEventHandler("onClientResourceStart", resourceRoot,

0 commit comments

Comments
 (0)