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

2011-08-20 18:30:38 +02:00 · 2011-08-20 18:30:38 +02:00 · 566660364b
parent 66e15a7991 0b6a963f34
commit 566660364b
4 changed files with 2 additions and 7 deletions
--- a/data/gfx/tileset01.jpg
+++ b/data/gfx/tileset01.jpg
--- a/data/gfx/tileset01.png
+++ b/data/gfx/tileset01.png
--- a/src/Functions.pbi
+++ b/src/Functions.pbi
@ -3,9 +3,10 @@

 ; *****************************************************************************
 ; * Tileset
+UsePNGImageDecoder()

 Procedure InitTileset()
-	CatchSprite(#Tile01, ?Gfx_Tileset)
+	LoadSprite(#Tile01, DataPath+"gfx/tileset01.png")
 	;ClipSprite(#Tile01, 0, 0, 16, 16)
 EndProcedure

--- a/src/Main.pb
+++ b/src/Main.pb
@ -113,9 +113,3 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent
 EndIf

 End
-
-
-
-DataSection
-	Gfx_Tileset:
-		IncludeBinary "../data/gfx/tileset01.bmp"