merge2
This commit is contained in:
parent
d68b5d32e9
commit
f6ab4d9452
1 changed files with 0 additions and 4 deletions
|
@ -6,11 +6,7 @@
|
|||
UsePNGImageDecoder()
|
||||
|
||||
Procedure InitTileset()
|
||||
<<<<<<< HEAD
|
||||
LoadSprite(#Tile01, DataPath+"gfx/tileset01.bmp")
|
||||
=======
|
||||
LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png")
|
||||
>>>>>>> f089be7018687821daf886b8c0e8a0d907df0e2d
|
||||
;ClipSprite(#Tile01, 0, 0, 16, 16)
|
||||
EndProcedure
|
||||
|
||||
|
|
Loading…
Reference in a new issue