From 7cef684e71b64f00b41da66ba7bc581568d78f51 Mon Sep 17 00:00:00 2001
From: Jed Barber <jjbarber@y7mail.com>
Date: Sun, 6 Aug 2017 22:17:54 +1000
Subject: Factored out some trivial bits into Misc, made coding style more
 consistent

---
 src/things.ads | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

(limited to 'src/things.ads')

diff --git a/src/things.ads b/src/things.ads
index c8da450..3babe65 100644
--- a/src/things.ads
+++ b/src/things.ads
@@ -3,8 +3,7 @@
 private with
 
     FLTK.Images.RGB.PNG,
-    Ada.Command_Line,
-    Ada.Directories;
+    Misc;
 
 
 package Things is
@@ -12,24 +11,23 @@ package Things is
 
     type Thing is tagged private;
 
-
     Nothing : constant Thing;
 
-
     Man      : constant Thing;
     Treasure : constant Thing;
 
+    function "="
+           (A, B : in Thing)
+        return Boolean;
+
+
+
 
     procedure Draw
            (This : in Thing;
             X, Y : in Integer);
 
 
-    function "="
-           (A, B : in Thing)
-        return Boolean;
-
-
 private
 
 
@@ -38,9 +36,7 @@ private
     end record;
 
 
-    Origin : String := Ada.Directories.Containing_Directory
-        (Ada.Directories.Full_Name (Ada.Command_Line.Command_Name));
-    Image_Dir : String := Origin & "/../share/sokoban/img";
+    Image_Dir : String := Misc.Origin & "/../share/sokoban/img";
 
 
     Man_Image : aliased FLTK.Images.RGB.PNG.PNG_Image :=
-- 
cgit