aboutsummaryrefslogtreecommitdiff
path: root/gamemode/client/cl_inventory.lua
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2018-11-03 18:23:45 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2018-11-03 18:23:45 -0400
commit28affa22541b9ef251707793f6b1c1a26d663592 (patch)
tree622754894d75c74dc5e8516ccf184ad4bf328fef /gamemode/client/cl_inventory.lua
parentc639e7c7c6ab1595fdce39f56312e3d6a886bbe8 (diff)
downloadartery-28affa22541b9ef251707793f6b1c1a26d663592.tar.gz
artery-28affa22541b9ef251707793f6b1c1a26d663592.tar.bz2
artery-28affa22541b9ef251707793f6b1c1a26d663592.zip
Started on new npc system
Started work on the new npc system
Diffstat (limited to 'gamemode/client/cl_inventory.lua')
-rw-r--r--gamemode/client/cl_inventory.lua3
1 files changed, 2 insertions, 1 deletions
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua
index f0c4d07..8f88d7e 100644
--- a/gamemode/client/cl_inventory.lua
+++ b/gamemode/client/cl_inventory.lua
@@ -12,7 +12,7 @@
]]
--local qinv = nrequire("cl_qinventory.lua")
local state = nrequire("cl_state.lua") --Holds weather or not player is in inventory
-local itm = nrequire("core/inventory/common/items.lua")
+local itm = nrequire("core/inventory/cl_invtracker.lua")
local log = nrequire("log.lua")
--local qpray = nrequire("cl_qprayers.lua")
local inv = {}
@@ -99,6 +99,7 @@ end
---Shows the player's inventory.
-- If the player's inventory hasn't been built yet, builds the inventory, then displays it.
+-- @domain client
function inv.ShowInventory()
print('Showing inventory')
if not qframe then