arg/ld21-ESCape
3
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge2

Browse source
This commit is contained in:
Ruben Müller 2011-08-20 18:45:54 +02:00
parent d68b5d32e9
commit f6ab4d9452
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Functions.pbi
View file

@ -6,11 +6,7 @@
UsePNGImageDecoder() UsePNGImageDecoder()
Procedure InitTileset() Procedure InitTileset()
<<<<<<< HEAD
LoadSprite(#Tile01, DataPath+"gfx/tileset01.bmp")
=======
LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png") LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png")
>>>>>>> f089be7018687821daf886b8c0e8a0d907df0e2d
;ClipSprite(#Tile01, 0, 0, 16, 16) ;ClipSprite(#Tile01, 0, 0, 16, 16)
EndProcedure EndProcedure