diff options
| author | Scott <scotth0828@gmail.com> | 2016-05-07 19:39:48 -0400 |
|---|---|---|
| committer | Scott <scotth0828@gmail.com> | 2016-05-07 19:39:48 -0400 |
| commit | f589757485e72ece0fc5e08f3e9bc63cac7605b4 (patch) | |
| tree | 4ee6f172ebd1260864335b44372b8945f9e2291b /gamemode/cl_deathmenu.lua | |
| parent | 0a134b81cc62e25cdf1e94f014b5c460e14c4dd1 (diff) | |
| download | gmstranded-f589757485e72ece0fc5e08f3e9bc63cac7605b4.tar.gz gmstranded-f589757485e72ece0fc5e08f3e9bc63cac7605b4.tar.bz2 gmstranded-f589757485e72ece0fc5e08f3e9bc63cac7605b4.zip | |
Images added to gravestone and combinations menu now gets images from resources
Diffstat (limited to 'gamemode/cl_deathmenu.lua')
| -rw-r--r-- | gamemode/cl_deathmenu.lua | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/gamemode/cl_deathmenu.lua b/gamemode/cl_deathmenu.lua index 0a3474b..259f48b 100644 --- a/gamemode/cl_deathmenu.lua +++ b/gamemode/cl_deathmenu.lua @@ -46,13 +46,6 @@ local function receive_message(len) res = net.ReadTable() wep = net.ReadTable() -for k,v in pairs(wep) do - print("death weapon: "..k.." : "..v) - end - for k,v in pairs(res) do - print("death resource: "..k.." : "..v) - end - if (active == 0) then dmFrame = vgui.Create("dmFrame") active = 1 end end @@ -139,7 +132,7 @@ function PANEL:Init() local img = vgui.Create("DImage", wepPNL) img:SetPos(0, 0) img:SetSize(wepPNL:GetSize()) - img:SetImage("gms_icons/gms_weapon.png") + img:SetImage("items/gms_weapon.png") end @@ -159,6 +152,7 @@ function PANEL:Init() for k,v in pairs(res) do local resPNL = vgui.Create( "DButton", DScrollPanel ) resPNL:SetSize( width, height ) + resPNL:SetText("") if (k/4 <= column2) then resPNL:SetPos( (row2-1)*(width+2) + XOffset,(column2-1)*(height+2) + (column*height + 50)) row2=row2+1 @@ -198,9 +192,9 @@ function PANEL:Init() end local img = vgui.Create("DImage", resPNL) - img:SetPos(0, 0) - img:SetSize(resPNL:GetSize()) - img:SetImage("gms_icons/gms_resourcepack.png") + img:SetPos(20, 10) + img:SetSize(resPNL:GetWide()-40, resPNL:GetTall()-40) + if (GMS.GetResourceByName(getResName(v)).Icon != nil) then img:SetImage(GMS.GetResourceByName(getResName(v)).Icon) else img:SetImage("vgui/avatar_default") end end end |
