Skip to content

Fix two major issues with trying to use the CustomAlert() function #294

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

Merged
MonkeyWhisper merged 2 commits into from
Sep 17, 2024
Merged

Fix two major issues with trying to use the CustomAlert() function #294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcbc666
Fix mistake with addBlip function
PugDev23 Sep 17, 2024
3d0f26b
Fixed false being a string making it true
PugDev23 Sep 17, 2024
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
4 changes: 2 additions & 2 deletions client/alerts.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ local function CustomAlert(data)
length = data.length or 2, -- How long it stays on the map
sound = data.sound or "Lose_1st", -- Alert sound
sound2 = data.sound2 or "GTAO_FM_Events_Soundset", -- Alert sound
offset = data.offset or "false", -- Blip / radius offset
flash = data.flash or "false" -- Blip flash
offset = data.offset or false, -- Blip / radius offset
flash = data.flash or false -- Blip flash
},
jobs = { 'leo' },
}
Expand Down
2 changes: 1 addition & 1 deletion client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ RegisterNetEvent('ps-dispatch:client:notify', function(data, source)
}
})

addBlip(data, Config.Blips[data.codeName] or data)
addBlip(data, Config.Blips[data.codeName] or data.alert)

RespondToDispatch:disable(false)
OpenDispatchMenu:disable(true)
Expand Down