diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-05 23:07:49 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2016-05-05 23:07:49 -0400 |
| commit | 91f43cff95bd402e738180c53fbf0482e799cf19 (patch) | |
| tree | 3bceb17037b4af73079ce82559fa7362f6e17d1c /gamemode/client/cl_inventory.lua | |
| parent | 67d8e45b7af28aee1fb865c2108725d19c04ca52 (diff) | |
| parent | 45392b8691d82bafe1aa405c44ed7fe5808ca293 (diff) | |
| download | gmstranded-91f43cff95bd402e738180c53fbf0482e799cf19.tar.gz gmstranded-91f43cff95bd402e738180c53fbf0482e799cf19.tar.bz2 gmstranded-91f43cff95bd402e738180c53fbf0482e799cf19.zip | |
Merge branch 'master' of ssh://cogarr.net:43/home/git/gmstranded
Diffstat (limited to 'gamemode/client/cl_inventory.lua')
| -rw-r--r-- | gamemode/client/cl_inventory.lua | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gamemode/client/cl_inventory.lua b/gamemode/client/cl_inventory.lua index 076dd2a..598ca97 100644 --- a/gamemode/client/cl_inventory.lua +++ b/gamemode/client/cl_inventory.lua @@ -396,6 +396,7 @@ function PANEL:Init() local slot = vgui.Create("DButton", dpnl) slot:SetSize(dPanelWidth/5, 100) + slot:SetText("") slot:SetTooltip(createTooltipTextFor(v.Req)) slot.DoClick = function() --print("I want to combine a " .. v.Name) @@ -418,14 +419,14 @@ function PANEL:Init() surface.SetFont( "ButtonText" ) surface.SetTextColor( 255,255,255 ) - surface.SetTextPos( (slot:GetWide()/2) - ( surface.GetTextSize(k)/2 ), (slot:GetTall()/2) + (select( 2, surface.GetTextSize( k ) )/2) ) + surface.SetTextPos( (slot:GetWide()/2) - ( surface.GetTextSize(k)/2 ), (slot:GetTall()/2) + (select( 2, surface.GetTextSize( k ) )-5) ) surface.DrawText( v.Name ) end local img = vgui.Create("DImage", slot) - img:SetPos(0, 0) - img:SetSize(slot:GetWide(), slot:GetTall()-20) - img:SetImage("gms_icons/gms_weapon.png") + 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 i=i+1 |