Merge pull request OpenDiablo2#1097 from drpaneas/fix_config

Fix config.json issues
drpaneas · Mar 24, 2021 · 6c00b32 · 6c00b32
2 parents 421d425 + f8881ed
commit 6c00b32
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 21 deletions.
diff --git a/d2app/app.go b/d2app/app.go
@@ -241,6 +241,7 @@ func (a *App) LoadConfig() (*d2config.Configuration, error) {
 	configAsset, _ := a.asset.LoadAsset(configBaseName)
 
 	config := &d2config.Configuration{}
+	config.SetPath(d2config.DefaultConfigPath())
 
 	// create the default if not found
 	if configAsset == nil {

diff --git a/d2app/initialization.go b/d2app/initialization.go
@@ -54,11 +54,11 @@ func (a *App) initialize() error {
 }
 
 const (
-	fmtErrSourceNotFound = `file not found: %s
+	fmtErrSourceNotFound = `file not found: %q
 
-Please check your config file at %s
+Please check your config file at %q
 
-Also, verify that the MPQ files exist at %s
+Also, verify that the MPQ files exist at %q
 
 Capitalization in the file name matters.
 `

diff --git a/d2core/d2config/default_directories.go b/d2core/d2config/default_directories.go
@@ -6,10 +6,7 @@ import (
 )
 
 const (
-	od2ConfigDirName = "OpenDiablo2"
-)
-
-const (
+	od2ConfigDirName  = "OpenDiablo2"
 	od2ConfigFileName = "config.json"
 )
 

diff --git a/d2core/d2config/defaults.go b/d2core/d2config/defaults.go
@@ -23,7 +23,7 @@ func DefaultConfig() *Configuration {
 		MpqPath:         "C:/Program Files (x86)/Diablo II",
 		Backend:         "Ebiten",
 		MpqLoadOrder: []string{
-			"Patch_D2.mpq",
+			"patch_d2.mpq",
 			"d2exp.mpq",
 			"d2xmusic.mpq",
 			"d2xtalk.mpq",
@@ -45,19 +45,6 @@ func DefaultConfig() *Configuration {
 		}
 	case "darwin":
 		config.MpqPath = "/Applications/Diablo II/"
-		config.MpqLoadOrder = []string{
-			"Diablo II Patch",
-			"Diablo II Expansion Data",
-			"Diablo II Expansion Movies",
-			"Diablo II Expansion Music",
-			"Diablo II Expansion Speech",
-			"Diablo II Game Data",
-			"Diablo II Graphics",
-			"Diablo II Movies",
-			"Diablo II Music",
-			"Diablo II Sounds",
-			"Diablo II Speech",
-		}
 	case "linux":
 		if usr, err := user.Current(); err == nil {
 			config.MpqPath = path.Join(usr.HomeDir, ".wine/drive_c/Program Files (x86)/Diablo II")