mirrors/CC-Tweaked
1
0
Fork 0
mirror of https://github.com/SquidDev-CC/CC-Tweaked synced 2024-12-12 19:20:29 +00:00
Code Issues Releases Wiki Activity

Don't sync the whole palette in window.setPaletteColour

Browse Source
This commit is contained in:
Lignum 2017-05-07 12:46:23 +02:00
parent 156e74b69c
commit 4e55e03c8b
No known key found for this signature in database
GPG Key ID: 0889206F5A8A700D
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/resources/assets/computercraft/lua/rom/apis/window
View File

@ -289,8 +289,16 @@ function create( parent, nX, nY, nWidth, nHeight, bStartVisible )
function window.setPaletteColour( colour, r, g, b )
if type(colour) == "table" then
for k,v in pairs(colour) do
tPalette[k] = v
if type(v) == "number" then
local vr, vg, vb = colours.rgb8( v )
tPalette[k] = { vr, vg, vb }
parent.setPaletteColour( k, vr, vg, vb )
elseif type(v) == "table" then
tPalette[k] = v
parent.setPaletteColour( k, table.unpack( v ) )
end
end
return
elseif type(colour) == "number" and type(r) == "number" and g == nil and b == nil then
tPalette[ colour ] = { colours.rgb8( r ) }
elseif type(colour) == "number" and type(r) == "number" and type(g) == "number" and type(b) == "number" then
@ -301,7 +309,7 @@ function create( parent, nX, nY, nWidth, nHeight, bStartVisible )
end
if bVisible then
return updatePalette()
return parent.setPaletteColour( colour, tPalette[ colour ] )
end
end