diff --git a/src/osdep/amiberry_whdbooter.cpp b/src/osdep/amiberry_whdbooter.cpp index 3167b435..4e71a5a7 100644 --- a/src/osdep/amiberry_whdbooter.cpp +++ b/src/osdep/amiberry_whdbooter.cpp @@ -707,8 +707,7 @@ void whdload_auto_prefs(struct uae_prefs* p, char* filepath) } // SOUND OPTIONS - if (!strcmpi(host_detail.sound_on,"false") == 0 || !strcmpi(host_detail.sound_on,"off") == 0 || !strcmpi(host_detail. - sound_on,"none") == 0) + if (strcmpi(host_detail.sound_on,"false") == 0 || strcmpi(host_detail.sound_on,"off") == 0 || strcmpi(host_detail.sound_on,"none") == 0) { _stprintf(txt2, "sound_output=none"); cfgfile_parse_line(p, txt2, 0); diff --git a/whdboot/boot-data/S/startup-sequence b/whdboot/boot-data/S/startup-sequence index 3c2b77d0..1c24e6e8 100755 --- a/whdboot/boot-data/S/startup-sequence +++ b/whdboot/boot-data/S/startup-sequence @@ -2,6 +2,10 @@ C:Assign ENV: RAM: >nil: C:Assign T: RAM: >nil: C:Assign PROGDIR: C: >nil: +cd :WHDbooter/ +c:run SplashScreen +c:wait 2 + Resident C:WHDLoad PURE Echo "" @@ -35,18 +39,21 @@ endif IF $MouseInput EQ 1 Echo "Left Mouse Button held. Force creation of new Auto-Startup file" Echo "" + c:wait 4 + ELSE SET Reply `C:joytest 1 0` IF $Reply EQ "(Fire-1)" Echo "Joystick Fire held. Force creation of new Auto-Startup file" Echo "" + c:wait 4 ELSE Echo "Scan for auto-startup and debugging messages..." cd :WHDbooter/ - Find_AutoStartup.exe + Find_AutoStartup Echo "Scan done" Echo "" @@ -60,14 +67,15 @@ IF EXISTS T:auto-startup Echo "" ELSE cd :WHDbooter/ - GameBootLoader.exe scanpath=WHDLoadGame: only usefolderpath + c:wait 2 + GameBootLoader scanpath=WHDLoadGame: only usefolderpath ENDIF ; ====================== -;IF EXISTS :WHDbooter/SplashScreen.exe +;IF EXISTS :WHDbooter/SplashScreen ; cd :WHDbooter -; :WHDbooter/SplashScreen.exe >NIL: +; :WHDbooter/SplashScreen >NIL: ;ELSE ; c:TUDE hardreset >nil: ;ENDIF diff --git a/whdboot/boot-data/WHDBooter/Find_AutoStartup b/whdboot/boot-data/WHDBooter/Find_AutoStartup new file mode 100755 index 00000000..d2ef4c2d Binary files /dev/null and b/whdboot/boot-data/WHDBooter/Find_AutoStartup differ diff --git a/whdboot/boot-data/WHDBooter/GameBootLoader b/whdboot/boot-data/WHDBooter/GameBootLoader new file mode 100755 index 00000000..375b9cd2 Binary files /dev/null and b/whdboot/boot-data/WHDBooter/GameBootLoader differ diff --git a/whdboot/boot-data/WHDBooter/Splash/intro_000.iff b/whdboot/boot-data/WHDBooter/Splash/intro_000.iff deleted file mode 100755 index bf6a621f..00000000 Binary files a/whdboot/boot-data/WHDBooter/Splash/intro_000.iff and /dev/null differ diff --git a/whdboot/boot-data/WHDBooter/Splash/intro_000A.iff b/whdboot/boot-data/WHDBooter/Splash/intro_000A.iff new file mode 100755 index 00000000..04724353 Binary files /dev/null and b/whdboot/boot-data/WHDBooter/Splash/intro_000A.iff differ diff --git a/whdboot/boot-data/WHDBooter/Splash/titlesound b/whdboot/boot-data/WHDBooter/Splash/titlesound deleted file mode 100755 index ad3af703..00000000 Binary files a/whdboot/boot-data/WHDBooter/Splash/titlesound and /dev/null differ diff --git a/whdboot/boot-data/WHDBooter/SplashScreen b/whdboot/boot-data/WHDBooter/SplashScreen new file mode 100755 index 00000000..fc6ce8ec Binary files /dev/null and b/whdboot/boot-data/WHDBooter/SplashScreen differ