merge

src/Draw.pbi

@@ -40,4 +40,5 @@ Procedure DrawRunningGame()
   StopDrawing()
   
   DisplaySprite(GFXTileset, 20, 20)
+  DrawMap()
 EndProcedure

src/Functions.pbi

@@ -12,6 +12,17 @@ Procedure InitTileset()
 	ClipSprite(GFXTileset, 0, 0, 16, 16)
 EndProcedure
 
+Procedure DrawTile(number.i, x.i, y.i)
+  Debug number.i
+  Debug x.i
+  Debug y.i
+EndProcedure
+
+Procedure DrawMap()
+  
+EndProcedure
+
+
 
 ; *****************************************************************************
 ; * Menu
@@ -27,3 +38,5 @@ Procedure Menu_GotoCurrent()
     Next
   EndIf
 EndProcedure
+
+

src/Globals.pbi

@@ -7,13 +7,20 @@ Global Title.s = "ESCape - Build " + Str(#PB_Editor_BuildCount)
 Global Screen.ScreenDimension\width = 800
 Screen.ScreenDimension\height = 600
 
+; Player
+Global Player.MapPoint\X = 10
+Player.MapPoint\Y = 10
+
+; Them map
+Global Dim GameField(50, 50)
+
 NewMap GameStates.GameState()
 Global NewMap Menus.GameMenu()
 Global CurrentState.s = "MAIN_MENU"
 Global *ActiveMenu.GameMenu
 
 ; Fonts
-Global Font_H1 = LoadFont(1, "Courier", 40, #PB_Font_Bold)
+Global Font_H1 = LoadFont(1, "Arial", 40, #PB_Font_Bold)
 Global Font_H2 = LoadFont(2, "Verdana", 18)
 
 ; Graphics
@@ -23,3 +30,8 @@ Global GFXTileset.i
 ; 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.jpg")
+

src/Main.pb

@@ -13,8 +13,8 @@ EndIf
 
 XIncludeFile "Structs.pbi"
 XIncludeFile "Globals.pbi"
-XIncludeFile "Draw.pbi"
 XIncludeFile "Functions.pbi"
+XIncludeFile "Draw.pbi"
 XIncludeFile "Events.pbi"
 
 

src/Structs.pbi

@@ -31,3 +31,8 @@ Structure GameMenu
   Title.s
   List Entries.GameMenuItem()
 EndStructure
+
+Structure MapPoint
+  X.i
+  Y.i
+EndStructure