From 0a490d7d811c682a8d0f5a74840583028f13822a Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alexandermpickering@gmail.com>
Date: Fri, 17 Nov 2017 00:08:55 -0500
Subject: Various updates

Fixed a few problems with dependencies
---
 gamemode/client/cl_inventory.lua | 29 +++++++++++++----------------
 1 file changed, 13 insertions(+), 16 deletions(-)

(limited to 'gamemode/client/cl_inventory.lua')

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
-- 
cgit v1.2.3-70-g09d2