Merge branch 'master' of c:/Users/Aaron/Desktop/game/Git

This commit is contained in:
Aaron 2011-08-20 18:30:38 +02:00
commit 566660364b
4 changed files with 2 additions and 7 deletions

BIN
data/gfx/tileset01.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 35 KiB

BIN
data/gfx/tileset01.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

View file

@ -3,9 +3,10 @@
; ***************************************************************************** ; *****************************************************************************
; * Tileset ; * Tileset
UsePNGImageDecoder()
Procedure InitTileset() Procedure InitTileset()
CatchSprite(#Tile01, ?Gfx_Tileset) LoadSprite(#Tile01, DataPath+"gfx/tileset01.png")
;ClipSprite(#Tile01, 0, 0, 16, 16) ;ClipSprite(#Tile01, 0, 0, 16, 16)
EndProcedure EndProcedure

View file

@ -113,9 +113,3 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent
EndIf EndIf
End End
DataSection
Gfx_Tileset:
IncludeBinary "../data/gfx/tileset01.bmp"