Merge branch 'master' of c:/Users/Aaron/Desktop/game/Git
Conflicts: src/Globals.pbi
This commit is contained in:
commit
9dba2fb5ee
5 changed files with 8 additions and 5 deletions
Binary file not shown.
Before Width: | Height: | Size: 32 KiB After Width: | Height: | Size: 48 KiB |
|
@ -33,5 +33,5 @@ EndProcedure
|
|||
Procedure DrawRunningGame()
|
||||
;Box(0, 0, 200, 200, RGB(0, 255, 0))
|
||||
|
||||
DisplaySprite(#Tile01, 20, 20)
|
||||
DrawImage(ImageID(#Tile01), 20, 20)
|
||||
EndProcedure
|
||||
|
|
|
@ -3,10 +3,8 @@
|
|||
|
||||
; *****************************************************************************
|
||||
; * Tileset
|
||||
UsePNGImageDecoder()
|
||||
|
||||
Procedure InitTileset()
|
||||
LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png")
|
||||
|
||||
;ClipSprite(#Tile01, 0, 0, 16, 16)
|
||||
EndProcedure
|
||||
|
||||
|
|
|
@ -29,3 +29,8 @@ EndEnumeration
|
|||
; Sounds
|
||||
LoadSound(0, #DATA_PATH + "sound/menu_change.wav")
|
||||
LoadSound(1, #DATA_PATH + "sound/menu_select.wav")
|
||||
|
||||
: Images
|
||||
UseJPEGImageDecoder()
|
||||
Debug LoadImage(#Tile01, #DATA_PATH+"gfx/tileset01.jp")
|
||||
|
||||
|
|
|
@ -95,7 +95,7 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
Debug CurrentState
|
||||
; Debug CurrentState
|
||||
|
||||
; Handle the events for the current state
|
||||
GameStates(CurrentState)\HandleEventFun()
|
||||
|
|
Loading…
Reference in a new issue