Merge branch 'master' of https://gitea.planet-casio.com/KikooDX/demo-04-20
This commit is contained in:
commit
61e9776916
6
demo.lua
6
demo.lua
|
@ -53,11 +53,17 @@ for i = 1, 12, 1 do
|
|||
file:write("}")
|
||||
end
|
||||
|
||||
<<<<<<< HEAD
|
||||
file:write("\ndraw(", math.floor(192 - image_infos.width / 2), ",")
|
||||
file:write(math.floor(96 - image_infos.height / 2), ",data,pallet,")
|
||||
file:write(image_infos.width, ")")
|
||||
|
||||
first = false
|
||||
=======
|
||||
file:write("}\ndraw(", math.floor(192 - image_infos.width / 2), ",")
|
||||
file:write(math.floor(96 - image_infos.height / 2), ",data,pallet,")
|
||||
file:write(image_infos.width, ")")
|
||||
>>>>>>> dc863ec6136d72e041c5f550bba9eb5d84f343c5
|
||||
end
|
||||
|
||||
file:close()
|
||||
|
|
Loading…
Reference in New Issue