diff --git a/d2core/d2config/default_directories.go b/d2core/d2config/default_directories.go index 0c09859a..c33ab988 100644 --- 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 index 7e8a539b..cfd5eb4c 100644 --- 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")