git @ Cat's Eye Technologies linapple / d01bd58
Configuration file is now loaded, even if the user specifies a disk image for FDD1 arlo authored 7 years ago T. Joseph Carter committed 3 years ago
1 changed file(s) with 19 addition(s) and 17 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>
3130 #include "stdafx.h"
3231 //#pragma hdrstop
3332 #include "MouseInterface.h"
905904 DiskInitialize();
906905 CreateColorMixMap(); // For tv emulation g_nAppMode
907906
908 //This part of the code inserts disks if any were specified on the command line.
909 int nError = 0;
910 if(szImageName_drive1)
911 {
912 nError = DoDiskInsert(0, szImageName_drive1);
913 bBoot = true;
914 }
915 if(szImageName_drive2)
916 {
917 nError |= DoDiskInsert(1, szImageName_drive2);
918 }
919
920
921907
922908
923909 do
927913 g_nAppMode = MODE_LOGO;
928914
929915 //Start with default configuration, which we will override if command line options were specified
930 if(!bBoot) {
931 LoadConfiguration();
916 LoadConfiguration();
917
918 //Overwrite configuration file's set fullscreen option, if one was specified on the command line
919 if(bSetFullScreen) {
920 fullscreen = bSetFullScreen;
932921 }
933922
934 fullscreen = bSetFullScreen;
923 //This part of the code inserts disks if any were specified on the command line, overwriting the
924 //configuration settings.
925 int nError = 0;
926 if(szImageName_drive1)
927 {
928 nError = DoDiskInsert(0, szImageName_drive1);
929
930 bBoot = true;
931 }
932 if(szImageName_drive2)
933 {
934 nError |= DoDiskInsert(1, szImageName_drive2);
935 }
936
935937
936938 FrameCreateWindow();
937939