aboutsummaryrefslogtreecommitdiff
path: root/gamemode/inventorysystem/shapedinventory
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2018-07-21 19:08:34 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2018-07-21 19:08:34 -0400
commit81d3d4eb333e226432a591461b84ed12f5ac9a3f (patch)
treed802983c3caf6683f1fd8eb881c7df65afa0d27b /gamemode/inventorysystem/shapedinventory
parentbfdf805676684a838dde5d4cdeb3d8c972d5003d (diff)
downloadartery-81d3d4eb333e226432a591461b84ed12f5ac9a3f.tar.gz
artery-81d3d4eb333e226432a591461b84ed12f5ac9a3f.tar.bz2
artery-81d3d4eb333e226432a591461b84ed12f5ac9a3f.zip
Various updates
* Animation api now allows sequences to be played * items now have a .inv attribute that is set when they are added to shaped or equipment inventories * Refactored the way skill inventory is structured * Added some more methods to cl_common to move items around on a player * Minor update to nrequire to display purple message when asked to include a file that dosn't exist.
Diffstat (limited to 'gamemode/inventorysystem/shapedinventory')
-rw-r--r--gamemode/inventorysystem/shapedinventory/sh_shaped.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/gamemode/inventorysystem/shapedinventory/sh_shaped.lua b/gamemode/inventorysystem/shapedinventory/sh_shaped.lua
index 42edaa6..1e87e42 100644
--- a/gamemode/inventorysystem/shapedinventory/sh_shaped.lua
+++ b/gamemode/inventorysystem/shapedinventory/sh_shaped.lua
@@ -66,6 +66,7 @@ function inv:Put(tbl,item)
--Now set the item in the correct slot
local slot = calcposition(self.width,self.height,tbl[1],tbl[2])
self.tracker[slot] = item
+ item.inv = self
end
function inv:Has(ptr)
@@ -97,6 +98,7 @@ function inv:Remove(tbl)
end
end
end
+ item.inv = nil
return item
end