gravestench/OpenDiablo2
1
1
Fork 0
mirror of https://github.com/OpenDiablo2/OpenDiablo2 synced 2025-02-10 10:36:42 -05:00
Code Issues Releases Wiki Activity

Merge pull request #1097 from drpaneas/fix_config

Browse Source 
Fix config.json issues
This commit is contained in:
Tim Sarbin 2021-03-24 08:53:10 -04:00 committed by GitHub
commit 6c00b3241f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
d2app/app.go
View File

@ -241,6 +241,7 @@ func (a *App) LoadConfig() (*d2config.Configuration, error) {
configAsset, _ := a.asset.LoadAsset(configBaseName) configAsset, _ := a.asset.LoadAsset(configBaseName)
config := &d2config.Configuration{} config := &d2config.Configuration{}
config.SetPath(d2config.DefaultConfigPath())
// create the default if not found // create the default if not found
if configAsset == nil { if configAsset == nil {

6
d2app/initialization.go
View File

@ -54,11 +54,11 @@ func (a *App) initialize() error {
} }
const ( 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. Capitalization in the file name matters.
` `

3
d2core/d2config/default_directories.go
View File

@ -7,9 +7,6 @@ import (
const ( const (
od2ConfigDirName = "OpenDiablo2" od2ConfigDirName = "OpenDiablo2"
)
const (
od2ConfigFileName = "config.json" od2ConfigFileName = "config.json"
) )

15
d2core/d2config/defaults.go
View File

@ -23,7 +23,7 @@ func DefaultConfig() *Configuration {
MpqPath: "C:/Program Files (x86)/Diablo II", MpqPath: "C:/Program Files (x86)/Diablo II",
Backend: "Ebiten", Backend: "Ebiten",
MpqLoadOrder: []string{ MpqLoadOrder: []string{
"Patch_D2.mpq", "patch_d2.mpq",
"d2exp.mpq", "d2exp.mpq",
"d2xmusic.mpq", "d2xmusic.mpq",
"d2xtalk.mpq", "d2xtalk.mpq",
@ -45,19 +45,6 @@ func DefaultConfig() *Configuration {
} }
case "darwin": case "darwin":
config.MpqPath = "/Applications/Diablo II/" 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": case "linux":
if usr, err := user.Current(); err == nil { if usr, err := user.Current(); err == nil {
config.MpqPath = path.Join(usr.HomeDir, ".wine/drive_c/Program Files (x86)/Diablo II") config.MpqPath = path.Join(usr.HomeDir, ".wine/drive_c/Program Files (x86)/Diablo II")