Merge branch 'master' of ssh://xen/var/git/ESCape

src/Functions.pbi

@@ -166,6 +166,8 @@ EndProcedure
 Procedure DrawHUD()
 EndProcedure
 
+; and ..
+
 
 ; *****************************************************************************
 ; * Menu
@@ -188,4 +190,4 @@ EndProcedure
 ; Folding = ---
 ; EnableXP
 ; EnableCompileCount = 0
-; EnableBuildCount = 0
+; EnableBuildCount = 0

src/Globals.pbi

@@ -13,6 +13,12 @@
 #TILESET_TYPE_SOLID = 3
 #TILESET_TYPE_GRASS = 4
 
+; Player directions
+#PLAYER_DIR_UP = 0
+#PLAYER_DIR_RIGHT = 0
+#PLAYER_DIR_DOWN = 0
+#PLAYER_DIR_LEFT = 0
+
 ; Global variables
 Global Fullscreen = 0
 Global Title.s = "ESCape - Build " + Str(#PB_Editor_BuildCount)
@@ -20,9 +26,10 @@ Global Screen.ScreenDimension\width = 800
 Screen.ScreenDimension\height = 600
 
 ; Player
-Global Player.Tile\X = 0
+Global Player.Player\X = 0
-Player.Tile\Y = 0
+Player.Player\Y = 0
-Player.Tile\TileNumber = 0
+Player.Player\TileNumber = 0
+Player.Player\Direction = #PLAYER_DIR_RIGHT
 
 ; Camera
 Global Cam.Camera\X = 0
@@ -61,4 +68,4 @@ Global Dim ShadowMap.Shadow(#MAP_WIDTH, #MAP_HEIGHT)
 ; FirstLine = 11
 ; EnableXP
 ; EnableCompileCount = 0
-; EnableBuildCount = 0
+; EnableBuildCount = 0

src/Main.pb

@@ -71,11 +71,11 @@ menus("RLY_QUIT")\Entries() = Item
 *ActiveMenu.GameMenu = @Menus(CurrentState)
 
 
-
 ; Start the main loop which will create the window, wait for events and draw things
 ; on the screen. To escape from this loop, press ESC or close the window.
 If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCentered)
   OpenWindowedScreen(WindowID(0), 0, 0, Screen\Width, Screen\Height, 0, 0, 0)
+  SetFrameRate(40)
   
   ; For Linux compatibility
   CompilerSelect #PB_Compiler_OS
@@ -115,6 +115,8 @@ If OpenWindow(0, 0, 0, Screen\Width, Screen\Height, title, #PB_Window_ScreenCent
         OpenWindowedScreen(WindowID(0), 0, 0, 800, 600, 0, 0, 0)
         Fullscreen = 0
       EndIf
+      
+      SetFrameRate(40)
       InitGraphics()
       InitTileset()
     EndIf
@@ -142,4 +144,4 @@ End
 ; FirstLine = 72
 ; EnableXP
 ; EnableCompileCount = 0
-; EnableBuildCount = 0
+; EnableBuildCount = 0

src/Structs.pbi

@@ -43,6 +43,13 @@ Structure Tile
   Health.i
 EndStructure
 
+Structure Player
+  X.i
+  Y.i
+  TileNumber.i
+  Direction.i
+EndStructure
+
 Structure Shadow
   X.i
   Y.i