Skip to content

Commit

Permalink
"Fixed" radio_yell and radio_whisper
Browse files Browse the repository at this point in the history
There was some check about being a duplex radio or something in there.... I hope this doesn't break anything, but it solves an immediate issue with the code, so whatever.
  • Loading branch information
fauxzor committed May 27, 2022
1 parent 1d1ba32 commit ee05e01
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions plugins/radio_extended/sh_plugin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -1434,9 +1434,9 @@ function PLUGIN:OverwriteClasses()
if ( (item) and !item:GetData("scanning",false) ) or ( (item) and item:GetData("scanning",false) and item:GetData("broadcast",false) ) then
if (!client:IsRestricted()) then

if (item:GetData("duplex",item.duplex) and bRepeater != false) or (!item:GetData("duplex",item.duplex)) then
--if (item:GetData("duplex",item.duplex) and bRepeater != false) or (!item:GetData("duplex",item.duplex)) then
ix.chat.Send(client, "radio_yell", message,nil,nil,{repeater=bRepeater, broadcast = broadcasting, callsign=call, walkie = transmitWalkie, lrange=transmitLong, freq=client:GetCharacter():GetData("frequency"), chan=client:GetCharacter():GetData("channel")})
end
--end
ix.chat.Send(client, "radio_eavesdrop_yell", message,nil,nil,{quiet=item:GetData("silenced"),walkie = transmitWalkie})
--endChatter(client,0)
--playSound(client, "npc/metropolice/vo/on", true)
Expand Down Expand Up @@ -1538,9 +1538,9 @@ function PLUGIN:OverwriteClasses()
if ( (item) and !item:GetData("scanning",false) ) or ( (item) and item:GetData("scanning",false) and item:GetData("broadcast",false) ) then
if (!client:IsRestricted()) then

if (item:GetData("duplex",item.duplex) and bRepeater != false) or (!item:GetData("duplex",item.duplex)) then
--if (item:GetData("duplex",item.duplex) and bRepeater != false) or (!item:GetData("duplex",item.duplex)) then
ix.chat.Send(client, "radio_whisper", message,nil,nil,{repeater=bRepeater, broadcast = broadcasting, callsign=call, walkie = transmitWalkie, lrange=transmitLong, freq=client:GetCharacter():GetData("frequency"), chan=client:GetCharacter():GetData("channel")})
end
--end
ix.chat.Send(client, "radio_eavesdrop_whisper", message,nil,nil,{quiet=item:GetData("silenced"),walkie = transmitWalkie})
--endChatter(client,0)
--playSound(client, "npc/metropolice/vo/on", true)
Expand Down

0 comments on commit ee05e01

Please sign in to comment.