Skip to content

Minor changes in WireLib #3185

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
Denneisk merged 2 commits into from
Nov 26, 2024
Merged

Minor changes in WireLib #3185

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
240f7a1
Minor improvements in WireLib
Astralcircle Nov 24, 2024
712e1e0
Fix non-existent sound
Astralcircle Nov 24, 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
5 changes: 2 additions & 3 deletions lua/wire/client/cl_wirelib.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,12 +237,11 @@ end

function WireLib.hud_debug(text, oneframe)
hook.Add("HUDPaint","wire_hud_debug",function()
if oneframe then hook.Remove("HUDPaint","wire_hud_debug") end
draw.DrawText(text,"Trebuchet24",10,200,Color(255,255,255,255),0)
if oneframe then hook.Remove("HUDPaint", "wire_hud_debug") end
draw.DrawText(text, "Trebuchet24", 10, ScrH() / 5, color_white, 0)
end)
end


local old_renderhalos = WireLib.__old_renderhalos or hook.GetTable().PostDrawEffects.RenderHalos
WireLib.__old_renderhalos = old_renderhalos
if old_renderhalos ~= nil then
Expand Down
25 changes: 9 additions & 16 deletions lua/wire/wireshared.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,13 +238,12 @@ do
NOTIFYSOUND_CONFIRM4 = 10

if CLIENT then

local sounds = {
[NOTIFYSOUND_DRIP1 ] = "ambient/water/drip1.wav",
[NOTIFYSOUND_DRIP2 ] = "ambient/water/drip2.wav",
[NOTIFYSOUND_DRIP3 ] = "ambient/water/drip3.wav",
[NOTIFYSOUND_DRIP4 ] = "ambient/water/drip4.wav",
[NOTIFYSOUND_DRIP5 ] = "ambient/water/drip5.wav",
[NOTIFYSOUND_DRIP5 ] = "ambient/water/drip4.wav", -- Non-existent sound, left for compatibility
[NOTIFYSOUND_ERROR1 ] = "buttons/button10.wav",
[NOTIFYSOUND_CONFIRM1] = "buttons/button3.wav",
[NOTIFYSOUND_CONFIRM2] = "buttons/button14.wav",
Expand All @@ -258,39 +257,33 @@ do
elseif ply ~= LocalPlayer() then
return
end

GAMEMODE:AddNotify(Message, Type, Duration)
if Sound and sounds[Sound] then surface.PlaySound(sounds[Sound]) end
end

net.Receive("wire_addnotify", function(netlen)
local Message = net.ReadString()
local Type = net.ReadUInt(8)
local Type = net.ReadUInt(3)
local Duration = net.ReadFloat()
local Sound = net.ReadUInt(8)
local Sound = net.ReadUInt(4)

WireLib.AddNotify(LocalPlayer(), Message, Type, Duration, Sound)
end)

elseif SERVER then

NOTIFY_GENERIC = 0
NOTIFY_ERROR = 1
NOTIFY_UNDO = 2
NOTIFY_HINT = 3
NOTIFY_CLEANUP = 4

else
util.AddNetworkString("wire_addnotify")

function WireLib.AddNotify(ply, Message, Type, Duration, Sound)
if isstring(ply) then ply, Message, Type, Duration, Sound = nil, ply, Message, Type, Duration end
if ply and not ply:IsValid() then return end

net.Start("wire_addnotify")
net.WriteString(Message)
net.WriteUInt(Type or 0,8)
net.WriteUInt(Type or 0, 3)
net.WriteFloat(Duration)
net.WriteUInt(Sound or 0,8)
net.WriteUInt(Sound or 0, 4)
if ply then net.Send(ply) else net.Broadcast() end
end

end
end -- wire_addnotify

Expand Down
Loading