diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-07 23:19:43 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-07 23:19:43 -0400 |
| commit | 98e22ce970aa7b67e36f24a0fef8a694cbac098a (patch) | |
| tree | 161d98b9cc9a165b0d185bcc3d1d3649844c8115 /gamemode/client | |
| parent | 755b58de20df6151a63d99c5baf6191c499f0b87 (diff) | |
| parent | 99faf35965c51e9b5340ffaaab102718a875d7d8 (diff) | |
| download | gmstranded-98e22ce970aa7b67e36f24a0fef8a694cbac098a.tar.gz gmstranded-98e22ce970aa7b67e36f24a0fef8a694cbac098a.tar.bz2 gmstranded-98e22ce970aa7b67e36f24a0fef8a694cbac098a.zip | |
Merge branch 'master' of ssh://cogarr.net:43/home/git/gmstranded
Diffstat (limited to 'gamemode/client')
| -rw-r--r-- | gamemode/client/cl_inventory.lua | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua index 9a19fa7..c178f4f 100644 --- a/gamemode/client/cl_inventory.lua +++ b/gamemode/client/cl_inventory.lua @@ -406,9 +406,15 @@ function PANEL:Init() local img = vgui.Create("DImage", slot) img:SetPos(20, 10) img:SetSize(slot:GetWide()-40, slot:GetTall()-40) - if (v.Icon != nil) then img:SetImage(v.Icon) else img:SetImage("vgui/avatar_default") end - - + // for some reason has stone twice? v + for j,k in SortedPairs(v.Results) do + if (j != "Stone") then + icon = GMS.GetResourceByName(j).Icon + if (icon != nil && icon != "test.png") then img:SetImage(icon) else img:SetImage("vgui/avatar_default") end + end + end + + i=i+1 end |