1
0
mirror of https://github.com/20kdc/OC-KittenOS.git synced 2024-11-27 12:58:05 +11:00

Fix up some loading bugs in app-nbox2018

This commit is contained in:
20kdc 2018-04-25 15:57:02 +01:00
parent 5c4d9ac17f
commit 26be65e1bb

View File

@ -579,10 +579,10 @@ local function reset()
end end
local function loadObj(obj) local function loadObj(obj)
fileLabel = obj.label fileLabel = obj.label or ""
fileTooltip = obj.tooltip fileTooltip = obj.tooltip or ""
redstone = obj.emitRedstone redstone = obj.emitRedstone or false
button = obj.buttonMode button = obj.buttonMode or false
local advances = { local advances = {
[false] = 65, [false] = 65,
[true] = 65 [true] = 65
@ -596,7 +596,7 @@ local function loadObj(obj)
maxX = v[4], maxX = v[4],
maxY = v[5], maxY = v[5],
maxZ = v[6], maxZ = v[6],
tex = v.texture, tex = v.texture or "",
rgb = v.tint or 0xFFFFFF rgb = v.tint or 0xFFFFFF
} }
advances[vs] = advances[vs] + 1 advances[vs] = advances[vs] + 1