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

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

Browse source 
Conflicts:
	src/Globals.pbi
This commit is contained in:
Aaron 2011-08-20 19:13:03 +02:00
commit 9dba2fb5ee
5 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/gfx/tileset01.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 32 KiB

After

Width:  |  Height:  |  Size: 48 KiB

2
src/Draw.pbi
View file

@ -33,5 +33,5 @@ EndProcedure
Procedure DrawRunningGame() Procedure DrawRunningGame()
;Box(0, 0, 200, 200, RGB(0, 255, 0)) ;Box(0, 0, 200, 200, RGB(0, 255, 0))
DisplaySprite(#Tile01, 20, 20) DrawImage(ImageID(#Tile01), 20, 20)
EndProcedure EndProcedure

4
src/Functions.pbi
View file

@ -3,10 +3,8 @@
; ***************************************************************************** ; *****************************************************************************
; * Tileset ; * Tileset
UsePNGImageDecoder()
Procedure InitTileset() Procedure InitTileset()
LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png")
;ClipSprite(#Tile01, 0, 0, 16, 16) ;ClipSprite(#Tile01, 0, 0, 16, 16)
EndProcedure EndProcedure

5
src/Globals.pbi
View file

@ -29,3 +29,8 @@ EndEnumeration
; Sounds ; Sounds
LoadSound(0, #DATA_PATH + "sound/menu_change.wav") LoadSound(0, #DATA_PATH + "sound/menu_change.wav")
LoadSound(1, #DATA_PATH + "sound/menu_select.wav") LoadSound(1, #DATA_PATH + "sound/menu_select.wav")
: Images
UseJPEGImageDecoder()
Debug LoadImage(#Tile01, #DATA_PATH+"gfx/tileset01.jp")

2
src/Main.pb
View file

@ -95,7 +95,7 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent
EndIf EndIf
EndIf EndIf
Debug CurrentState ; Debug CurrentState
; Handle the events for the current state ; Handle the events for the current state
GameStates(CurrentState)\HandleEventFun() GameStates(CurrentState)\HandleEventFun()