diff --git a/client/event.lua b/client/event.lua index 2041e1f..aa03497 100644 --- a/client/event.lua +++ b/client/event.lua @@ -11,6 +11,7 @@ end) AddEventHandler('onResourceStop', function(resource) if GetCurrentResourceName() == resource then Radio:toggleRadioAnimation(false) + Radio:toggleRadioAnimationTalk(false) Radio:RemoveJammerZone() if Radio.onRadio then Radio:leaveradio() @@ -213,6 +214,13 @@ RegisterNetEvent("pma-voice:radioActive", function(talkingState) radioId = tostring(Radio.playerServerID), radioTalking = talkingState }) + + -- Show radio prop when talking (if not already using radio UI) + if talkingState and not Radio.usingRadio and Radio.onRadio then + Radio:toggleRadioAnimationTalk(true) + elseif not talkingState and not Radio.usingRadio then + Radio:toggleRadioAnimationTalk(false) + end end) RegisterNetEvent("pma-voice:setTalkingOnRadio", function(source, talkingState) diff --git a/client/function.lua b/client/function.lua index 93a95cb..39ee5c5 100644 --- a/client/function.lua +++ b/client/function.lua @@ -186,6 +186,20 @@ function Radio:toggleRadioAnimation(pState) end end +function Radio:toggleRadioAnimationTalk(pState) + if pState then + -- Only attach radio prop for talking, no animation + self.radioTalkProp = CreateObject(`prop_cs_hand_radio`, 1.0, 1.0, 1.0, true, true, false) + AttachEntityToEntity(self.radioTalkProp, cache.ped, GetPedBoneIndex(cache.ped, 60309), 0.0750, 0.0230, -0.0230, -90.0000, 0.0, -59.9999, true, false, false, false, 2, true) + else + -- Remove radio prop when done talking + if self.radioTalkProp ~= 0 then + DeleteObject(self.radioTalkProp) + self.radioTalkProp = 0 + end + end +end + function Radio:CalculateTimeToDisplay() local hour = GetClockHours() local minute = GetClockMinutes() diff --git a/client/interface.lua b/client/interface.lua index 661da96..074cad0 100644 --- a/client/interface.lua +++ b/client/interface.lua @@ -11,6 +11,7 @@ Radio = { usingRadio = false, RadioChannel = 0, radioProp = 0, + radioTalkProp = 0, Volume = 30, favourite = {}, recomended = {},