Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for radio not working properly #15

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix for radio not working properly #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
62cf7af
Update cl_pogarage.lua
blurryrox May 15, 2021
7781cb6
Update respawn.lua
blurryrox May 15, 2021
f239335
Update cl_jobmanager.lua
blurryrox May 15, 2021
bbf1d5b
Update cl_broadcast.lua
blurryrox May 15, 2021
d005cfe
Merge branch 'swxy:main' into main
blurryrox Jun 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/np-broadcaster/cl_broadcast.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ end)


function becomeJob()
TriggerServerEvent("TokoVoip:addPlayerToRadio",19829, GetPlayerServerId(PlayerId()))
TriggerServerEvent("np:voice:radio:addPlayerToRadio",19829, GetPlayerServerId(PlayerId()))
isBroadcasting = true
end
RegisterNetEvent("broadcast:becomejob");
Expand Down
6 changes: 3 additions & 3 deletions resources/np-jobmanager/client/cl_jobmanager.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ AddEventHandler("np-jobmanager:playerBecameJob", function(job, name, notify)
end

if job == "trucker" then
TriggerServerEvent("TokoVoip:addPlayerToRadio", 4, GetPlayerServerId(PlayerId()))
TriggerServerEvent("np:voice:radio:addPlayerToRadio", 4, GetPlayerServerId(PlayerId()))
end

if job == "towtruck" then
TriggerEvent("DoLongHudText","Use /tow to tow cars to your truck.",1)
TriggerServerEvent("TokoVoip:addPlayerToRadio", 3, GetPlayerServerId(PlayerId()))
TriggerServerEvent("np:voice:radio:addPlayerToRadio", 3, GetPlayerServerId(PlayerId()))
end

if job == "news" then
Expand All @@ -47,4 +47,4 @@ end)
RegisterNetEvent("np-base:exportsReady")
AddEventHandler("np-base:exportsReady", function()
exports["np-base"]:addModule("JobManager", NPX.Jobs)
end)
end)
4 changes: 2 additions & 2 deletions resources/policegarage/cl_pogarage.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ end)

RegisterNetEvent('nowCopGarage')
AddEventHandler('nowCopGarage', function()
TriggerServerEvent("TokoVoip:addPlayerToRadio", 1, GetPlayerServerId(PlayerId()))
TriggerServerEvent("np:voice:radio:addPlayerToRadio", 1, GetPlayerServerId(PlayerId()))
TriggerEvent("ChannelSet",1)
isCop = true
isInService = true
Expand Down Expand Up @@ -246,4 +246,4 @@ function ChangeToFrancis(skin)
else
TriggerEvent("DoLongHudText","Model not found",2)
end
end
end
4 changes: 2 additions & 2 deletions resources/ragdoll/respawn.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ end)

RegisterNetEvent('hasSignedOnEms')
AddEventHandler('hasSignedOnEms', function()
TriggerServerEvent("TokoVoip:addPlayerToRadio", 2, GetPlayerServerId(PlayerId()))
TriggerServerEvent("np:voice:radio:addPlayerToRadio", 2, GetPlayerServerId(PlayerId()))
TriggerEvent("ChannelSet",2)
isEMS = true
end)
Expand Down Expand Up @@ -593,4 +593,4 @@ AddEventHandler('phoneGui', function()
else
TriggerEvent("phoneGui2")
end
end)
end)