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

src/Draw.pbi

@@ -32,12 +32,4 @@ EndProcedure
 
 Procedure DrawRunningGame()
   Box(0, 0, 200, 200, RGB(0, 255, 0))
-EndProcedure
+EndProcedure
-; IDE Options = PureBasic 4.51 (MacOS X - x86)
-; CursorPosition = 26
-; Folding = -
-; EnableUnicode
-; EnableThread
-; EnableXP
-; EnableCompileCount = 0
-; EnableBuildCount = 0

src/Events.pbi

@@ -35,12 +35,4 @@ Procedure HandleEventMenu()
 EndProcedure
 
 Procedure HandleEventRunningGame()
-EndProcedure
+EndProcedure
-; IDE Options = PureBasic 4.51 (MacOS X - x86)
-; CursorPosition = 32
-; Folding = -
-; EnableUnicode
-; EnableThread
-; EnableXP
-; EnableCompileCount = 0
-; EnableBuildCount = 0

src/Functions.pbi

@@ -1 +1 @@
-; This file holds all the functions If it gets too big,
; we can split it in categories

; *****************************************************************************
; * Menu

Procedure Menu_GotoCurrent()
  If *ActiveMenu\Entries()\Selected <> #True
    FirstElement(*ActiveMenu\Entries());
    
    ForEach *ActiveMenu\Entries()
      If *ActiveMenu\Entries()\Selected = #True
        Break
      EndIf
    Next
  EndIf
EndProcedure

; *****************************************************************************
; IDE Options = PureBasic 4.51 (MacOS X - x86)
; CursorPosition = 13
; Folding = -
; EnableXP
+; This file holds all the functions If it gets too big,
; we can split it in categories

; *****************************************************************************
; * Tileset

Procedure InitTileset()
  LoadImage
EndProcedure

; *****************************************************************************


; *****************************************************************************
; * Menu

Procedure Menu_GotoCurrent()
  If *ActiveMenu\Entries()\Selected <> #True
    FirstElement(*ActiveMenu\Entries());
    
    ForEach *ActiveMenu\Entries()
      If *ActiveMenu\Entries()\Selected = #True
        Break
      EndIf
    Next
  EndIf
EndProcedure

; *****************************************************************************

src/Globals.pbi

@@ -12,9 +12,4 @@ Global *ActiveMenu.GameMenu
 
 ; Fonts
 Global Font_H1 = LoadFont(1, "Courier", 40, #PB_Font_Bold)
-Global Font_H2 = LoadFont(2, "Verdana", 18)
+Global Font_H2 = LoadFont(2, "Verdana", 18)
-; IDE Options = PureBasic 4.51 (MacOS X - x86)
-; CursorPosition = 13
-; EnableXP
-; EnableCompileCount = 0
-; EnableBuildCount = 0

src/Main.pb

@@ -47,6 +47,8 @@ If ReadFile(0, "../data/menu.data")
   CloseFile(0)
 EndIf
 
+InitTileset()
+
 Menus("MAIN_MENU")\Title = "ESCape"
 
 Define Item.GameMenuItem
@@ -109,9 +111,5 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent
     Delay(1)
   Until KeyboardPushed(#PB_Key_Escape)
 EndIf
-; IDE Options = PureBasic 4.51 (MacOS X - x86)
+
-; CursorPosition = 65
+End
-; FirstLine = 9
-; EnableXP
-; EnableCompileCount = 0
-; EnableBuildCount = 0

src/Structs.pbi

@@ -30,11 +30,4 @@ EndStructure
 Structure GameMenu
   Title.s
   List Entries.GameMenuItem()
-EndStructure
+EndStructure
-; IDE Options = PureBasic 4.51 (MacOS X - x86)
-; CursorPosition = 32
-; EnableUnicode
-; EnableThread
-; EnableXP
-; EnableCompileCount = 1
-; EnableBuildCount = 0