Skip to content

Commit

Permalink
Recompiled radio models. Removed an unneeded function.
Browse files Browse the repository at this point in the history
Co-Authored-By: Wolf <[email protected]>
  • Loading branch information
Grocel and SligWolf committed Jan 7, 2024
1 parent 8ffd79a commit 9f84e26
Show file tree
Hide file tree
Showing 20 changed files with 3 additions and 88 deletions.
2 changes: 1 addition & 1 deletion lua/streamradio_core/_include.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ loadSH("streamradio_core/vr.lua")
loadSH("streamradio_core/wire.lua")

loadSV("streamradio_core/server/sv_lib.lua")
loadSV("streamradio_core/server/sv_res.lua")
loadSV("streamradio_core/server/sv_resource.lua")
loadSV("streamradio_core/server/sv_playlist_edit.lua")
loadSV("streamradio_core/server/sv_permaprops.lua")
loadSV("streamradio_core/server/sv_whitelist.lua")
Expand Down
85 changes: 0 additions & 85 deletions lua/streamradio_core/classes/base.lua
Original file line number Diff line number Diff line change
Expand Up @@ -110,91 +110,6 @@ function CLASS:CallHook(name, ...)
return func(self, ...)
end

local function getTrace(level, maxcount)
level = level or 2
maxcount = maxcount or 0

local trace = {}

if level == 0 then
return trace
end

while true do
local index = #trace
if maxcount > 0 and index > maxcount then break end

local info = debug.getinfo( level, "Sln" )
if not info then break end

local data = {}
data.what = info.what
data.name = info.name
data.isC = info.what == "C"

if not data.isC then
data.line = info.currentline
data.file = info.short_src
end

trace[index + 1] = data
level = level + 1
end

return trace
end

local color1 = Color(60, 200, 60)
local color2 = Color(120, 200, 120)
local color3 = Color(240, 120, 60)

function CLASS:Print(...)
local trace = getTrace(3)
local args = {...}

MsgC(color1, tostring(self), ":\n")

for k, info in pairs(trace) do
local name = info.name and "\"" .. info.name .. "\"" or "(unknown)"

if info.isC then
MsgC(color2, string.format( " %2.0f: C function %-30s\n", k, name ) )
else
MsgC(color2, string.format( " %2.0f: %-30s %s:%i\n", k, name, info.file, info.line ) )
end
end

Msg("\n")

if #args == 1 and istable(args[1]) then
args = args[1]
local i = 1

for k, v in pairs(args) do
MsgC(color3, string.format( "#%02.0f:\n", i) )
MsgC(color3, string.format( " key -> %10s:\t", i, type(k) ) )
Msg(tostring(k), "\n")

MsgC(color3, string.format( " value -> %10s:\t", i, type(k) ) )
Msg(tostring(v), "\n")
Msg("\n")

i = i + 1
end

return
end

for k, v in pairs(args) do
MsgC(color3, string.format( "#%02.0f -> %10s:\t", k, type(v) ) )
Msg(tostring(v), "\n")
end

Msg("\n\n")
end

CLASS.print = CLASS.Print

local g_string_format = string.format

function CLASS:_ToStringFailback()
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions materials/3dstreamradio/_data/version.vmt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
441
1704408199
442
1704655335
Binary file modified models/sligwolf/grocel/radio/ghettoblaster.dx90.vtx
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/ghettoblaster.mdl
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/ghettoblaster.phy
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/ghettoblaster.vvd
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/gramophone.dx90.vtx
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/gramophone.mdl
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/gramophone.phy
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/gramophone.vvd
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/jukebox.dx90.vtx
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/jukebox.mdl
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/jukebox.phy
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/jukebox.vvd
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/radio.dx90.vtx
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/radio.mdl
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/radio.phy
Binary file not shown.
Binary file modified models/sligwolf/grocel/radio/radio.vvd
Binary file not shown.

0 comments on commit 9f84e26

Please sign in to comment.