merge
This commit is contained in:
commit
d68b5d32e9
4 changed files with 12 additions and 8 deletions
|
@ -2,6 +2,7 @@
|
|||
|
||||
Procedure HandleEventMenu()
|
||||
If KeyboardReleased(#PB_Key_Up)
|
||||
PlaySound(0, #PB_Sound_MultiChannel)
|
||||
Menu_GotoCurrent()
|
||||
*ActiveMenu\Entries()\Selected = #False
|
||||
|
||||
|
@ -15,6 +16,7 @@ Procedure HandleEventMenu()
|
|||
EndIf
|
||||
|
||||
If KeyboardReleased(#PB_Key_Down)
|
||||
PlaySound(0, #PB_Sound_MultiChannel)
|
||||
Menu_GotoCurrent()
|
||||
*ActiveMenu\Entries()\Selected = #False
|
||||
|
||||
|
@ -29,6 +31,7 @@ Procedure HandleEventMenu()
|
|||
|
||||
; We go to the target game state
|
||||
If KeyboardReleased(#PB_Key_Return)
|
||||
PlaySound(1, #PB_Sound_MultiChannel)
|
||||
Menu_GotoCurrent()
|
||||
CurrentState = *ActiveMenu\Entries()\TargetState
|
||||
*ActiveMenu.GameMenu = Menus(CurrentState)
|
||||
|
|
|
@ -6,7 +6,11 @@
|
|||
UsePNGImageDecoder()
|
||||
|
||||
Procedure InitTileset()
|
||||
<<<<<<< HEAD
|
||||
LoadSprite(#Tile01, DataPath+"gfx/tileset01.bmp")
|
||||
=======
|
||||
LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png")
|
||||
>>>>>>> f089be7018687821daf886b8c0e8a0d907df0e2d
|
||||
;ClipSprite(#Tile01, 0, 0, 16, 16)
|
||||
EndProcedure
|
||||
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
|
||||
Global DataPath.s = "../data/"
|
||||
#DATA_PATH = "../data/"
|
||||
|
||||
; Global variables
|
||||
Global Fullscreen = 0
|
||||
|
@ -27,6 +27,6 @@ Enumeration 500
|
|||
EndEnumeration
|
||||
|
||||
; Sounds
|
||||
Global Dim Sounds.s(2)
|
||||
Sounds(0) = DataPath + "sound/menu_change.wav"
|
||||
Sounds(1) = DataPath + "sound/menu_select.wav"
|
||||
Global Dim Sounds.i(2)
|
||||
Sounds(0) = LoadSound(0, #DATA_PATH + "sound/menu_change.wav")
|
||||
Sounds(1) = LoadSound(1, #DATA_PATH + "sound/menu_select.wav")
|
||||
|
|
|
@ -18,9 +18,6 @@ XIncludeFile "Functions.pbi"
|
|||
XIncludeFile "Events.pbi"
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
; Initialize all the variables and stuff. I think we refactor this
|
||||
; into a separate file if it gets messy.
|
||||
GameStates("MAIN_MENU")\DrawFun = @DrawMenu()
|
||||
|
@ -115,4 +112,4 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent
|
|||
Until CurrentState = "QUIT"
|
||||
EndIf
|
||||
|
||||
End
|
||||
End
|
||||
|
|
Loading…
Reference in a new issue