Skip to content

Commit 67bd315

Browse files
committed
Merge pull request GmodStarfall#134 from awilliamson/iss133
Fixed AddNotify, changed WireLib.AddNotify to ours.
2 parents 691365f + fd9120b commit 67bd315

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

lua/entities/base_starfall_entity/init.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ end
3434
function ENT:Error ( msg )
3535
ErrorNoHalt( "Processor of " .. self.owner:Nick() .. " errored: " .. msg .. "\n" )
3636

37+
SF.AddNotify( self.instance.player, msg, NOTIFY_ERROR, 7, NOTIFYSOUND_ERROR1 )
38+
3739
if self.instance then
3840
self.instance:deinitialize()
3941
self.instance = nil
4042
end
4143

42-
SF.AddNotify( msg, NOTIFY_ERROR, 7, NOTIFYSOUND_ERROR1 )
43-
4444
end
4545

4646
function ENT:OnRemove ()

lua/entities/starfall_screen/cl_init.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ function ENT:Error ( msg )
115115
msg = ( file and ( file .. ":" ) or "" ) .. ( line and ( line .. ": " ) or "" ) .. msg.message
116116
end
117117
end
118-
WireLib.AddNotify( self.owner, tostring( msg ), NOTIFY_ERROR, 7, NOTIFYSOUND_ERROR1 )
118+
SF.AddNotify( self.owner, tostring( msg ), NOTIFY_ERROR, 7, NOTIFYSOUND_ERROR1 )
119119

120120
-- Process error message
121121
self.error = {}

lua/starfall/sflib.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ else
584584
net.WriteBit(false)
585585
net.SendToServer()
586586
if buildlist then
587-
WireLib.AddNotify("File not found: "..buildlist,NOTIFY_ERROR,7,NOTIFYSOUND_ERROR1)
587+
SF.AddNotify( "File not found: " .. buildlist, NOTIFY_ERROR, 7, NOTIFYSOUND_ERROR1 )
588588
end
589589
end
590590
end)

lua/weapons/gmod_tool/stools/starfall_processor.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ function TOOL:LeftClick( trace )
5454
if not IsValid(ent) then return end -- Probably removed during transfer
5555
ent:Compile(files, mainfile)
5656
end) then
57-
WireLib.AddNotify(ply,"Cannot upload SF code, please wait for the current upload to finish.",NOTIFY_ERROR,7,NOTIFYSOUND_ERROR1)
57+
SF.AddNotify( ply, "Cannot upload SF code, please wait for the current upload to finish.", NOTIFY_ERROR, 7, NOTIFYSOUND_ERROR1 )
5858
end
5959
return true
6060
end
@@ -87,7 +87,7 @@ function TOOL:LeftClick( trace )
8787
if not IsValid(sf) then return end -- Probably removed during transfer
8888
sf:Compile(files, mainfile)
8989
end) then
90-
WireLib.AddNotify(ply,"Cannot upload SF code, please wait for the current upload to finish.",NOTIFY_ERROR,7,NOTIFYSOUND_ERROR1)
90+
SF.AddNotify( ply, "Cannot upload SF code, please wait for the current upload to finish.", NOTIFY_ERROR, 7, NOTIFYSOUND_ERROR1 )
9191
end
9292

9393
return true

lua/weapons/gmod_tool/stools/starfall_screen.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ function TOOL:LeftClick( trace )
9292
if not IsValid(ent) then return end
9393
ent:CodeSent(ply, files, mainfile)
9494
end) then
95-
WireLib.AddNotify(ply,"Cannot upload SF code, please wait for the current upload to finish.",NOTIFY_ERROR,7,NOTIFYSOUND_ERROR1)
95+
SF.AddNotify( ply, "Cannot upload SF code, please wait for the current upload to finish.", NOTIFY_ERROR, 7, NOTIFYSOUND_ERROR1 )
9696
end
9797
return true
9898
end
@@ -125,7 +125,7 @@ function TOOL:LeftClick( trace )
125125
if not IsValid(sf) then return end
126126
sf:CodeSent(ply, files, mainfile)
127127
end) then
128-
WireLib.AddNotify(ply,"Cannot upload SF code, please wait for the current upload to finish.",NOTIFY_ERROR,7,NOTIFYSOUND_ERROR1)
128+
SF.AddNotify( ply, "Cannot upload SF code, please wait for the current upload to finish.", NOTIFY_ERROR, 7, NOTIFYSOUND_ERROR1 )
129129
end
130130

131131
return true

0 commit comments

Comments
 (0)