Fix executable relative asset loading regression

CHANGELOG.md

@@ -1,5 +1,7 @@
 Changelog
 ---------
+* 2.0.5
+	* Fix regression in loading assets relative to executable.
 * 2.0.4
 	* UI
 		* Change the load screen

game/intro.go

@@ -57,7 +57,7 @@ type IntroScreen struct {
 func (intro *IntroScreen) setInitialFont() {
 	fonts := intro.fonts
 
-	configuredFontPath, err := filepath.Abs(path.Join(AssetRoot, Font))
+	configuredFontPath, err := filepath.Abs(Font)
 	if err != nil {
 		log.Panicln("Your file system is broken", err)
 	}
@@ -198,9 +198,11 @@ func getAvailableFonts() *availableFonts {
 		}
 	}
 
-	return &availableFonts{
+	available := &availableFonts{
 		fonts: fontNames,
 	}
+
+	return available
 }
 
 func (intro *IntroScreen) maybeLoadSplash() {

game/main.go

@@ -130,14 +130,14 @@ func main() {
 
 var AssetRoot string
 
+var DefaultFontPath string
+
 var NoVSync = true
 var Seed int64
 var Font string
 var FontW int
 var FontH int
 
-var DefaultFontPath string = path.Join(AssetRoot, "assets", "font", "cp437_12x12.png")
-
 func GameSeed() int64 {
 	if Seed == -1 {
 		return time.Now().UnixNano()
@@ -153,13 +153,14 @@ func init() {
 		AssetRoot = ""
 	} else {
 		AssetRoot = filepath.Dir(AssetRoot)
-		log.Printf("Loading assets from %s", AssetRoot)
 	}
+	DefaultFontPath = path.Join(AssetRoot, "assets", "font", "cp437_12x12.png")
 
 	flag.BoolVar(&NoVSync, "no-vsync", false, "disable vsync")
 	flag.Int64Var(&Seed, "seed", -1, "Provide a seed for launching the game")
 	flag.StringVar(&Font, "font-path", DefaultFontPath, "Set font relative file path")
 	flag.IntVar(&FontW, "font-width", 12, "pixel width per character")
 	flag.IntVar(&FontH, "font-height", 12, "pixel height per character")
+	log.Println("DefaultFontPath", DefaultFontPath)
 	flag.Parse()
 }