diff options
Diffstat (limited to 'gamemode')
| -rw-r--r-- | gamemode/client/cl_inventory.lua | 29 | ||||
| -rw-r--r-- | gamemode/core/dataloader/cl_loadglobals.lua | 21 | ||||
| -rw-r--r-- | gamemode/core/inventory/cl_invtracker.lua | 1 | ||||
| -rw-r--r-- | gamemode/inventorysystem/skills/sh_skillcommon.lua | 2 | ||||
| -rw-r--r-- | gamemode/server/sv_loadplayer.lua | 2 | ||||
| -rw-r--r-- | gamemode/server/sv_noclip.lua | 6 | ||||
| -rw-r--r-- | gamemode/shared.lua | 6 |
7 files changed, 38 insertions, 29 deletions
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua index 838cdfb..91627d0 100644 --- a/gamemode/client/cl_inventory.lua +++ b/gamemode/client/cl_inventory.lua @@ -63,7 +63,8 @@ end local function BuildInventory() if qframe and IsValid(qframe) then return end - if not player_data then error("no player data!") player_data = {credits = 0} end + --if not player_data then error("no player data!") player_data = {credits = 0} end + if not player_data then return end --We havn't loaded in yet... qframe = vgui.Create("DFrame") qframe:SetPos(0,0) qframe:SetSize(width / 4, height) @@ -144,16 +145,6 @@ local previousheadscale = Vector(1,1,1) local toggle_arteryview = false hook.Add("CalcView","ArteryInventoryView",function(ply,pos,ang,fov,nearz,farz) if not toggle_arteryview then return end - if bone == nil then - bone = LocalPlayer():LookupBone("ValveBiped.Bip01_Head1") - end - local view = {} - local tr = util.TraceLine({ - start = pos, - endpos = (ang:Forward() * -100) + pos, - filter = LocalPlayer() - }) - view.origin = tr.HitPos or (ang:Forward() * -100) + pos if state.invopen then local trot = math.rad(CurTime() * rotatespeed) local xoff = viewdistance * math.sin(trot) @@ -161,14 +152,20 @@ hook.Add("CalcView","ArteryInventoryView",function(ply,pos,ang,fov,nearz,farz) view.origin = view.origin + Vector(xoff,yoff,10) ang.pitch = 20 ang.yaw = (-CurTime() * rotatespeed) - 90 + else + if bone == nil then + bone = LocalPlayer():LookupBone("ValveBiped.Bip01_Head1") + end + local view = {} + local tr = util.TraceLine({ + start = pos, + endpos = (ang:Forward() * -100) + pos, + filter = LocalPlayer() + }) + view.origin = tr.HitPos or (ang:Forward() * -100) + pos end view.angles = ang view.fov = fov - if not state.invopen then - LocalPlayer():ManipulateBoneScale(bone,Vector(0,0,0)) - else - LocalPlayer():ManipulateBoneScale(bone,previousheadscale) - end view.drawviewer = true--state.invopen return view diff --git a/gamemode/core/dataloader/cl_loadglobals.lua b/gamemode/core/dataloader/cl_loadglobals.lua index d286f36..c4837c8 100644 --- a/gamemode/core/dataloader/cl_loadglobals.lua +++ b/gamemode/core/dataloader/cl_loadglobals.lua @@ -1,4 +1,15 @@ local log = nrequire("log.lua") + +local function run_csfile(txt,name) + assert(#txt > 0, "File was size 0 on: " .. name) + local ptr = CompileString(txt,name,false) + if type(ptr) == "function" then + ptr() + else + log.error(ptr) + end +end + net.Receive("artery_respondfile",function() local filename = net.ReadString() local filetext = net.ReadString() @@ -6,7 +17,7 @@ net.Receive("artery_respondfile",function() file.CreateDir("artery/client/files/" .. dirname) assert(#filetext > 0, "Retreived a size 0 file: " .. filename) file.Write("artery/client/files/" .. filename,filetext) - CompileString(filetext,filename)() + run_csfile(filetext,filename) end) net.Receive("artery_loadfile",function() @@ -26,12 +37,6 @@ net.Receive("artery_loadfile",function() net.WriteString(filename) net.SendToServer() else - assert(#cache > 0, "File was size 0 on: " .. filename) - local err = CompileString(cache,filename,false) - if type(err) == "function" then - err() - else - log.error(err) - end + run_csfile(cache,filename) end end) diff --git a/gamemode/core/inventory/cl_invtracker.lua b/gamemode/core/inventory/cl_invtracker.lua index 14cbfbe..fdf5be3 100644 --- a/gamemode/core/inventory/cl_invtracker.lua +++ b/gamemode/core/inventory/cl_invtracker.lua @@ -3,6 +3,7 @@ ]] local inv = nrequire("inventory/inventory.lua") local itm = nrequire("item.lua") +nrequire("cl_loadglobals.lua") --local state = nrequire("cl_state.lua") local q = {} diff --git a/gamemode/inventorysystem/skills/sh_skillcommon.lua b/gamemode/inventorysystem/skills/sh_skillcommon.lua index 9640421..3247fc5 100644 --- a/gamemode/inventorysystem/skills/sh_skillcommon.lua +++ b/gamemode/inventorysystem/skills/sh_skillcommon.lua @@ -51,7 +51,7 @@ function lib.RegisterSkill(skillname) end end if alin then - log.warn("Re-registering skill: " .. skillname) + log.warn("Re-registering skill: " .. skillname[1] .. skillname[2]) else skills[group][#skills[group] + 1] = name end diff --git a/gamemode/server/sv_loadplayer.lua b/gamemode/server/sv_loadplayer.lua index f8c2568..faeaaf3 100644 --- a/gamemode/server/sv_loadplayer.lua +++ b/gamemode/server/sv_loadplayer.lua @@ -18,7 +18,7 @@ end hook.Add("PlayerInitialSpawn","ArteryPlayerLoad",function(pl) local modelnum = pl:UniqueID() % (#models) - timer.Simple(1,function() + timer.Simple(10,function() delayplayerload(pl) end) pl:SetModel(models[modelnum]) diff --git a/gamemode/server/sv_noclip.lua b/gamemode/server/sv_noclip.lua new file mode 100644 index 0000000..f36d563 --- /dev/null +++ b/gamemode/server/sv_noclip.lua @@ -0,0 +1,6 @@ +--Allow admins to noclip + +local function DisableNoclip( ply ) + return ply:IsAdmin() +end +hook.Add( "PlayerNoClip", "DisableNoclip", DisableNoclip ) diff --git a/gamemode/shared.lua b/gamemode/shared.lua index 6304bce..4b5e2b1 100644 --- a/gamemode/shared.lua +++ b/gamemode/shared.lua @@ -1,7 +1,7 @@ include("nrequire.lua") local ngm = GM or GAMEMODE -ngm.Version = {0,7,2} +ngm.Version = {0,7,3} ngm.Name = "Artery" ngm.Author = "Alexander \"Apickx\" Pickering" -ngm.Email = "alex@cogarr.net" -ngm.Website = "cogarr.net" +ngm.Email = "apickx@cogarr.com" +ngm.Website = "cogarr.com" |