diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-08 19:50:07 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-08 19:50:07 -0400 |
| commit | f529fc47c87ce254aad2c0506259b9d7521d3512 (patch) | |
| tree | ba832069036110de65e4a69a95241a299a6da9a2 /gamemode/client | |
| parent | 232ee552f30a37d1b0080f4aa4de43d7639971a5 (diff) | |
| parent | 5a7639b486aa9f672813fec32510e57a554d750b (diff) | |
| download | gmstranded-f529fc47c87ce254aad2c0506259b9d7521d3512.tar.gz gmstranded-f529fc47c87ce254aad2c0506259b9d7521d3512.tar.bz2 gmstranded-f529fc47c87ce254aad2c0506259b9d7521d3512.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 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua index 73df961..c779384 100644 --- a/gamemode/client/cl_inventory.lua +++ b/gamemode/client/cl_inventory.lua @@ -413,8 +413,17 @@ function PANEL:Init() // 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 + if(GMS.Resources[j] == nil) then --This resource is not registered! + img:SetImage("vgui/avatar_default") + print("Resource:" .. j .. " not registed! This might be a bug!") + continue + elseif(GMS.Resources[j].Icon == nil) then + img:SetImage("vgui/avatar_default") + print("Resource:" .. j .. " does not have an .Icon field! This might be a bug!") + continue + else + img:SetImage(GMS.Resources[j].Icon) + end end end |