diff options
Diffstat (limited to 'src/squares.ads')
| -rw-r--r-- | src/squares.ads | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/squares.ads b/src/squares.ads index 8ab911e..8a1f053 100644 --- a/src/squares.ads +++ b/src/squares.ads @@ -6,6 +6,7 @@ with private with + Ada.Directories, FLTK.Images.RGB.PNG, Misc; @@ -64,30 +65,27 @@ private end record; - Image_Dir : String := Misc.Origin & "/../share/sokoban/img"; - - - Wall_Image : aliased FLTK.Images.RGB.PNG.PNG_Image := - FLTK.Images.RGB.PNG.Forge.Create (Image_Dir & "/wall.png"); - Space_Image : aliased FLTK.Images.RGB.PNG.PNG_Image := - FLTK.Images.RGB.PNG.Forge.Create (Image_Dir & "/space.png"); - Empty_Image : aliased FLTK.Images.RGB.PNG.PNG_Image := - FLTK.Images.RGB.PNG.Forge.Create (Image_Dir & "/empty.png"); - Goal_Image : aliased FLTK.Images.RGB.PNG.PNG_Image := - FLTK.Images.RGB.PNG.Forge.Create (Image_Dir & "/goal.png"); + Wall_Image : aliased FLTK.Images.RGB.PNG.PNG_Image := FLTK.Images.RGB.PNG.Forge.Create + (Ada.Directories.Compose (Misc.Image_Path, "wall.png")); + Space_Image : aliased FLTK.Images.RGB.PNG.PNG_Image := FLTK.Images.RGB.PNG.Forge.Create + (Ada.Directories.Compose (Misc.Image_Path, "space.png")); + Empty_Image : aliased FLTK.Images.RGB.PNG.PNG_Image := FLTK.Images.RGB.PNG.Forge.Create + (Ada.Directories.Compose (Misc.Image_Path, "empty.png")); + Goal_Image : aliased FLTK.Images.RGB.PNG.PNG_Image := FLTK.Images.RGB.PNG.Forge.Create + (Ada.Directories.Compose (Misc.Image_Path, "goal.png")); Void : constant Square := (Walkable => False, Contents => Things.Nothing, Self_Image => null); - Wall : constant Square := + Wall : constant Square := (Walkable => False, Contents => Things.Nothing, Self_Image => Wall_Image'Access); Space : constant Square := (Walkable => False, Contents => Things.Nothing, Self_Image => Space_Image'Access); Empty : constant Square := (Walkable => True, Contents => Things.Nothing, Self_Image => Empty_Image'Access); - Goal : constant Square := + Goal : constant Square := (Walkable => True, Contents => Things.Nothing, Self_Image => Goal_Image'Access); |