rip out turtle specific options
Some checks failed
Build Go/Fyne App for macOS ARM64 / build (push) Has been cancelled
Some checks failed
Build Go/Fyne App for macOS ARM64 / build (push) Has been cancelled
This commit is contained in:
@@ -109,11 +109,11 @@ func LaunchGame(myWindow fyne.Window) {
|
||||
dialog.ShowError(fmt.Errorf("CrossOver path not set. Please set it in the patcher."), myWindow)
|
||||
return
|
||||
}
|
||||
if paths.TurtlewowPath == "" {
|
||||
if paths.EpochPath == "" {
|
||||
dialog.ShowError(fmt.Errorf("TurtleWoW path not set. Please set it in the patcher."), myWindow)
|
||||
return
|
||||
}
|
||||
if !paths.PatchesAppliedTurtleWoW || !paths.PatchesAppliedCrossOver {
|
||||
if !paths.PatchesAppliedEpoch || !paths.PatchesAppliedCrossOver {
|
||||
confirmed := false
|
||||
dialog.ShowConfirm("Warning", "Not all patches confirmed applied. Continue with launch?", func(c bool) {
|
||||
confirmed = c
|
||||
@@ -152,7 +152,7 @@ func LaunchGame(myWindow fyne.Window) {
|
||||
}
|
||||
wowExePath = GetWoWTweakedExecutablePath()
|
||||
} else {
|
||||
wowExePath = filepath.Join(paths.TurtlewowPath, "WoW.exe")
|
||||
wowExePath = filepath.Join(paths.EpochPath, "WoW.exe")
|
||||
}
|
||||
|
||||
// Continue with normal launch process
|
||||
@@ -161,7 +161,7 @@ func LaunchGame(myWindow fyne.Window) {
|
||||
|
||||
// continueLaunch continues the game launch process with the specified executable
|
||||
func continueLaunch(myWindow fyne.Window, wowExePath string) {
|
||||
rosettaInTurtlePath := filepath.Join(paths.TurtlewowPath, "rosettax87")
|
||||
rosettaInTurtlePath := filepath.Join(paths.EpochPath, "rosettax87")
|
||||
rosettaExecutable := filepath.Join(rosettaInTurtlePath, "rosettax87")
|
||||
wineloader2Path := filepath.Join(paths.CrossoverPath, "Contents", "SharedSupport", "CrossOver", "CrossOver-Hosted Application", "wineloader2")
|
||||
|
||||
@@ -180,7 +180,7 @@ func continueLaunch(myWindow fyne.Window, wowExePath string) {
|
||||
|
||||
// Auto-delete WDB directory if enabled
|
||||
if AutoDeleteWdb {
|
||||
wdbPath := filepath.Join(paths.TurtlewowPath, "WDB")
|
||||
wdbPath := filepath.Join(paths.EpochPath, "WDB")
|
||||
if utils.DirExists(wdbPath) {
|
||||
debug.Printf("Auto-deleting WDB directory: %s", wdbPath)
|
||||
if err := os.RemoveAll(wdbPath); err != nil {
|
||||
@@ -197,7 +197,7 @@ func continueLaunch(myWindow fyne.Window, wowExePath string) {
|
||||
// Since RosettaX87 service is already running, we can directly launch WoW
|
||||
debug.Println("RosettaX87 service is running. Proceeding to launch WoW.")
|
||||
|
||||
if paths.CrossoverPath == "" || paths.TurtlewowPath == "" {
|
||||
if paths.CrossoverPath == "" || paths.EpochPath == "" {
|
||||
dialog.ShowError(fmt.Errorf("CrossOver path or TurtleWoW path is not set. Cannot launch WoW."), myWindow)
|
||||
return
|
||||
}
|
||||
@@ -214,7 +214,7 @@ func continueLaunch(myWindow fyne.Window, wowExePath string) {
|
||||
}
|
||||
|
||||
shellCmd := fmt.Sprintf(`cd %s && %s %s %s %s`,
|
||||
utils.QuotePathForShell(paths.TurtlewowPath),
|
||||
utils.QuotePathForShell(paths.EpochPath),
|
||||
envVars,
|
||||
utils.QuotePathForShell(rosettaExecutable),
|
||||
utils.QuotePathForShell(wineloader2Path),
|
||||
|
Reference in New Issue
Block a user