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

Add OSX support for path fixups. (#251)

Browse Source
This commit is contained in:
Tim Sarbin 2019-12-14 00:15:52 -05:00 committed by GitHub
parent a194913609
commit 4eeac5c1d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
config.json
View File

@ -20,5 +20,18 @@
"d2sfx.mpq", "d2sfx.mpq",
"d2video.mpq", "d2video.mpq",
"d2speech.mpq" "d2speech.mpq"
] ],
"MpqMacLoadOrder": [
"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"
]
} }

29
d2corecommon/configuration.go
View File

@ -6,6 +6,7 @@ import (
"log" "log"
"os" "os"
"path" "path"
"runtime"
"strings" "strings"
"github.com/mitchellh/go-homedir" "github.com/mitchellh/go-homedir"
@ -22,6 +23,7 @@ type Configuration struct {
VsyncEnabled bool VsyncEnabled bool
MpqPath string MpqPath string
MpqLoadOrder []string MpqLoadOrder []string
MpqMacLoadOrder []string
SfxVolume float64 SfxVolume float64
BgmVolume float64 BgmVolume float64
} }
@ -39,17 +41,26 @@ func LoadConfiguration() *Configuration {
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
// Path fixup for wine-installed diablo 2 in linux if runtime.GOOS == "darwin" {
if config.MpqPath[0] != '/' { if config.MpqPath[0] != '/' {
if _, err := os.Stat(config.MpqPath); os.IsNotExist(err) { config.MpqPath = "/Applications/Diablo II/"
homeDir, _ := homedir.Dir() }
newPath := strings.ReplaceAll(config.MpqPath, `C:\`, homeDir+"/.wine/drive_c/") config.MpqLoadOrder = config.MpqMacLoadOrder
newPath = strings.ReplaceAll(newPath, "C:/", homeDir+"/.wine/drive_c/") } else {
newPath = strings.ReplaceAll(newPath, `\`, "/") // Path fixup for wine-installed diablo 2 in linux
if _, err := os.Stat(newPath); !os.IsNotExist(err) { if config.MpqPath[0] != '/' {
config.MpqPath = newPath if _, err := os.Stat(config.MpqPath); os.IsNotExist(err) {
homeDir, _ := homedir.Dir()
newPath := strings.ReplaceAll(config.MpqPath, `C:\`, homeDir+"/.wine/drive_c/")
newPath = strings.ReplaceAll(newPath, "C:/", homeDir+"/.wine/drive_c/")
newPath = strings.ReplaceAll(newPath, `\`, "/")
if _, err := os.Stat(newPath); !os.IsNotExist(err) {
config.MpqPath = newPath
}
} }
} }
} }
return &config return &config
} }