Allow game to be properly installable.

1 files changed, 7 insertions, 6 deletions

diff --git a/super-bloom/common.scm b/super-bloom/common.scm
index 0e55b90..7dd50a1 100644
--- a/super-bloom/common.scm
+++ b/super-bloom/common.scm
@@ -20,6 +20,7 @@
   #:use-module (chickadee audio)
   #:use-module (chickadee graphics text)
   #:use-module (oop goops)
+  #:use-module (super-bloom config)
   #:export (%default-width
             %default-height
             %game-width
@@ -45,22 +46,22 @@
 (define %game-height:float (exact->inexact %game-height))
 
 (define (scope-datadir file-name)
-  (let ((prefix (or (getenv "SUPERBLOOM_DATADIR") (getcwd))))
+  (let ((prefix (or (getenv "SUPERBLOOM_DATADIR") %datadir)))
     (string-append prefix "/" file-name)))
 
-(define-asset (monogram-font (file (scope-datadir "assets/fonts/monogram_extended.ttf")))
+(define-asset (monogram-font (file (scope-datadir "fonts/monogram_extended.ttf")))
   (load-font file 12 #:smooth? #f))
 
-(define-asset (explosion-sound (file (scope-datadir "assets/audio/explosion.wav")))
+(define-asset (explosion-sound (file (scope-datadir "audio/explosion.wav")))
   (load-audio file))
 
-(define-asset (absorb-sound (file (scope-datadir "assets/audio/absorb.wav")))
+(define-asset (absorb-sound (file (scope-datadir "audio/absorb.wav")))
   (load-audio file))
 
-(define-asset (watered-sound (file (scope-datadir "assets/audio/watered.wav")))
+(define-asset (watered-sound (file (scope-datadir "audio/watered.wav")))
   (load-audio file))
 
-(define-asset (spray-sound (file (scope-datadir "assets/audio/spray.wav")))
+(define-asset (spray-sound (file (scope-datadir "audio/spray.wav")))
   (load-audio file))
 
 (define (random:float n)