aboutsummaryrefslogtreecommitdiff
path: root/gamemode
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2018-03-23 15:54:14 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2018-03-23 15:54:14 -0400
commit30ca838a3700623dd445df7ceb13d84341dbef64 (patch)
treed948e2ca28fcd93dfcd5b218f5e2b300a741eed5 /gamemode
parent08c0f656531809fb3890ab896ef7a2dd031bb6f0 (diff)
downloadartery-30ca838a3700623dd445df7ceb13d84341dbef64.tar.gz
artery-30ca838a3700623dd445df7ceb13d84341dbef64.tar.bz2
artery-30ca838a3700623dd445df7ceb13d84341dbef64.zip
Switch back to third person
Entire game plays in 3rd person now.
Diffstat (limited to 'gamemode')
-rw-r--r--gamemode/cl_init.lua5
-rw-r--r--gamemode/client/cl_inventory.lua8
2 files changed, 10 insertions, 3 deletions
diff --git a/gamemode/cl_init.lua b/gamemode/cl_init.lua
index 07cd341..5f80850 100644
--- a/gamemode/cl_init.lua
+++ b/gamemode/cl_init.lua
@@ -6,6 +6,11 @@ print = function(...)
oldprint(debug.traceback())
end
]]
+--[[Create folders before doing anything else]]--
+file.CreateDir("artery")
+file.CreateDir("artery/client")
+file.CreateDir("artery/pacs")
+
include( "shared.lua" )
--print = oldprint
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua
index 671d16b..1e8fed8 100644
--- a/gamemode/client/cl_inventory.lua
+++ b/gamemode/client/cl_inventory.lua
@@ -53,7 +53,7 @@ local function CreateSheetTree(tabs,dpropertysheet)
local prox = v:DrawOnDPanel(tsheet)
v:AddObserver(prox)
else
- log.warn("Failed to draw inventory:" + v.Name + ", no DrawOnDPanel()")
+ log.warn("Failed to draw inventory:" .. v.Name .. ", no DrawOnDPanel()")
end
else
error("k was not a number or string, it was a " .. type(k))
@@ -62,6 +62,7 @@ local function CreateSheetTree(tabs,dpropertysheet)
end
local function BuildInventory()
+ print("Building inventory")
if qframe and IsValid(qframe) then return end
qframe = vgui.Create("DFrame")
qframe:SetPos(0,0)
@@ -147,8 +148,9 @@ local bone = nil
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
- local view = {}
+ local view = {
+ origin = ply:GetPos() + Vector(0,0,72)
+ }
if state.invopen then
local trot = math.rad(CurTime() * rotatespeed)
local xoff = viewdistance * math.sin(trot)