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

merge

Browse source
This commit is contained in:
Ruben Müller 2011-08-20 18:45:05 +02:00
commit d68b5d32e9
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Events.pbi
View file

@ -2,6 +2,7 @@
Procedure HandleEventMenu() Procedure HandleEventMenu()
If KeyboardReleased(#PB_Key_Up) If KeyboardReleased(#PB_Key_Up)
PlaySound(0, #PB_Sound_MultiChannel)
Menu_GotoCurrent() Menu_GotoCurrent()
*ActiveMenu\Entries()\Selected = #False *ActiveMenu\Entries()\Selected = #False
@ -15,6 +16,7 @@ Procedure HandleEventMenu()
EndIf EndIf
If KeyboardReleased(#PB_Key_Down) If KeyboardReleased(#PB_Key_Down)
PlaySound(0, #PB_Sound_MultiChannel)
Menu_GotoCurrent() Menu_GotoCurrent()
*ActiveMenu\Entries()\Selected = #False *ActiveMenu\Entries()\Selected = #False
@ -29,6 +31,7 @@ Procedure HandleEventMenu()
; We go to the target game state ; We go to the target game state
If KeyboardReleased(#PB_Key_Return) If KeyboardReleased(#PB_Key_Return)
PlaySound(1, #PB_Sound_MultiChannel)
Menu_GotoCurrent() Menu_GotoCurrent()
CurrentState = *ActiveMenu\Entries()\TargetState CurrentState = *ActiveMenu\Entries()\TargetState
*ActiveMenu.GameMenu = Menus(CurrentState) *ActiveMenu.GameMenu = Menus(CurrentState)

4
src/Functions.pbi
View file

@ -6,7 +6,11 @@
UsePNGImageDecoder() UsePNGImageDecoder()
Procedure InitTileset() Procedure InitTileset()
<<<<<<< HEAD
LoadSprite(#Tile01, DataPath+"gfx/tileset01.bmp") LoadSprite(#Tile01, DataPath+"gfx/tileset01.bmp")
=======
LoadSprite(#Tile01, #DATA_PATH+"gfx/tileset01.png")
>>>>>>> f089be7018687821daf886b8c0e8a0d907df0e2d
;ClipSprite(#Tile01, 0, 0, 16, 16) ;ClipSprite(#Tile01, 0, 0, 16, 16)
EndProcedure EndProcedure

8
src/Globals.pbi
View file

@ -1,5 +1,5 @@
 
Global DataPath.s = "../data/" #DATA_PATH = "../data/"
; Global variables ; Global variables
Global Fullscreen = 0 Global Fullscreen = 0
@ -27,6 +27,6 @@ Enumeration 500
EndEnumeration EndEnumeration
; Sounds ; Sounds
Global Dim Sounds.s(2) Global Dim Sounds.i(2)
Sounds(0) = DataPath + "sound/menu_change.wav" Sounds(0) = LoadSound(0, #DATA_PATH + "sound/menu_change.wav")
Sounds(1) = DataPath + "sound/menu_select.wav" Sounds(1) = LoadSound(1, #DATA_PATH + "sound/menu_select.wav")

3
src/Main.pb
View file

@ -18,9 +18,6 @@ XIncludeFile "Functions.pbi"
XIncludeFile "Events.pbi" XIncludeFile "Events.pbi"
; Initialize all the variables and stuff. I think we refactor this ; Initialize all the variables and stuff. I think we refactor this
; into a separate file if it gets messy. ; into a separate file if it gets messy.
GameStates("MAIN_MENU")\DrawFun = @DrawMenu() GameStates("MAIN_MENU")\DrawFun = @DrawMenu()