git @ Cat's Eye Technologies linapple / 1f5a992
Fixed bug which caused -f option not to work if the system was not booting from disk. arlo authored 7 years ago T. Joseph Carter committed 3 years ago
1 changed file(s) with 14 addition(s) and 9 deletion(s). Raw diff Collapse all Expand all
2727
2828 /* Adaptation for SDL and POSIX (l) by beom beotiger, Nov-Dec 2007, krez beotiger March 2012 AD */
2929
30 #include <iostream>
3031 #include "stdafx.h"
3132 //#pragma hdrstop
3233 #include "MouseInterface.h"
904905 DiskInitialize();
905906 CreateColorMixMap(); // For tv emulation g_nAppMode
906907
908 //This part of the code inserts disks if any were specified on the command line.
907909 int nError = 0;
908910 if(szImageName_drive1)
909911 {
910 nError = DoDiskInsert(0, szImageName_drive1);
911 bBoot = true;
912 nError = DoDiskInsert(0, szImageName_drive1);
913 bBoot = true;
912914 }
913915 if(szImageName_drive2)
914916 {
915917 nError |= DoDiskInsert(1, szImageName_drive2);
916918 }
917919
918 //
919
920
921
922
920923 do
921924 {
922925 // DO INITIALIZATION THAT MUST BE REPEATED FOR A RESTART
923926 restart = 0;
924927 g_nAppMode = MODE_LOGO;
928
929 //Start with default configuration, which we will override if command line options were specified
930 if(!bBoot) {
931 LoadConfiguration();
932 }
933
925934 fullscreen = bSetFullScreen;
926935
927 if(!bBoot) {
928 LoadConfiguration();
929 }
930936 FrameCreateWindow();
931937
932938 if (!DSInit()) soundtype = SOUND_NONE; // Direct Sound and Stuff
962968 //
963969 if(bBoot)
964970 {
965 // autostart
971 // autostart
966972 setAutoBoot();
967 bBoot = false;
968973 }
969974
970975 JoyReset();