detach fsys from NewGame()

preparing for web version
hndada · Nov 28, 2022 · 34cb1aa · 34cb1aa
1 parent 508afa4
commit 34cb1aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/cmd/gosu/main.go b/cmd/gosu/main.go
@@ -13,7 +13,8 @@ func main() {
 	if err != nil {
 		log.Fatal(err)
 	}
-	g := gosu.NewGame(os.DirFS(dir))
+	gosu.Load(os.DirFS(dir))
+	g := gosu.NewGame()
 	if err := ebiten.RunGame(g); err != nil {
 		panic(err)
 	}

diff --git a/game.go b/game.go
@@ -44,7 +44,7 @@ var (
 )
 
 // Todo: tidy NewSettings() and *Settings.Load()?
-func load(fsys fs.FS) {
+func Load(fsys fs.FS) {
 	data, err := fs.ReadFile(fsys, "settings.toml")
 	if err != nil {
 		fmt.Println("no settings.toml detected")
@@ -79,8 +79,8 @@ func load(fsys fs.FS) {
 	}
 }
 
-func NewGame(fsys fs.FS) *game {
-	load(fsys)
+func NewGame() *game {
+	// load(fsys)
 	// dir, err := os.Getwd()
 	// if err != nil {
 	// log.Fatal(err)
@@ -93,7 +93,7 @@ func NewGame(fsys fs.FS) *game {
 	// 	panic(err)
 	// }
 	g := &game{
-		FS:     fsys,
+		// FS:     fsys,
 		Scene:  nil,
 		choose: choose.NewScene(),
 	}