diff options
Diffstat (limited to 'src/squares.ads')
| -rw-r--r-- | src/squares.ads | 23 |
1 files changed, 6 insertions, 17 deletions
diff --git a/src/squares.ads b/src/squares.ads index 3eca22f..b4ced0f 100644 --- a/src/squares.ads +++ b/src/squares.ads @@ -12,9 +12,8 @@ with private with - Ada.Directories, - FLTK.Images.RGB.PNG, - Misc; + Data, + FLTK.Images.RGB.PNG; package Squares is @@ -71,28 +70,18 @@ private end record; - 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 := - (Walkable => False, Contents => Things.Nothing, Self_Image => Wall_Image'Access); + (Walkable => False, Contents => Things.Nothing, Self_Image => Data.Wall_Image); Space : constant Square := - (Walkable => False, Contents => Things.Nothing, Self_Image => Space_Image'Access); + (Walkable => False, Contents => Things.Nothing, Self_Image => Data.Space_Image); Empty : constant Square := - (Walkable => True, Contents => Things.Nothing, Self_Image => Empty_Image'Access); + (Walkable => True, Contents => Things.Nothing, Self_Image => Data.Empty_Image); Goal : constant Square := - (Walkable => True, Contents => Things.Nothing, Self_Image => Goal_Image'Access); + (Walkable => True, Contents => Things.Nothing, Self_Image => Data.Goal_Image); end Squares; |