Subversion Repositories eduke32

Rev

Rev 5470 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 5470 Rev 5558
Line 583... Line 583...
583
extern int32_t demorec_diffs_cvar, demoplay_diffs;
583
extern int32_t demorec_diffs_cvar, demoplay_diffs;
584
extern int32_t demorec_difftics_cvar, demorec_diffcompress_cvar, demorec_synccompress_cvar;
584
extern int32_t demorec_difftics_cvar, demorec_diffcompress_cvar, demorec_synccompress_cvar;
585
585
586
int32_t CONFIG_ReadSetup(void)
586
int32_t CONFIG_ReadSetup(void)
587
{
587
{
588
    int32_t dummy, i = 0;
588
    int32_t dummy;
589
    char commmacro[] = "CommbatMacro# ";
589
    char commmacro[] = "CommbatMacro# ";
590
    char tempbuf[1024];
590
    char tempbuf[1024];
591
591
592
    CONTROL_ClearAssignments();
592
    CONTROL_ClearAssignments();
593
    CONFIG_SetDefaults();
593
    CONFIG_SetDefaults();
Line 598... Line 598...
598
#ifndef EDUKE32_TOUCH_DEVICES
598
#ifndef EDUKE32_TOUCH_DEVICES
599
    if (SafeFileExists(setupfilename) && ud.config.scripthandle < 0)  // JBF 20031211
599
    if (SafeFileExists(setupfilename) && ud.config.scripthandle < 0)  // JBF 20031211
600
        ud.config.scripthandle = SCRIPT_Load(setupfilename);
600
        ud.config.scripthandle = SCRIPT_Load(setupfilename);
601
    else if (SafeFileExists(SETUPFILENAME) && ud.config.scripthandle < 0)
601
    else if (SafeFileExists(SETUPFILENAME) && ud.config.scripthandle < 0)
602
    {
602
    {
-
 
603
        int32_t i;
603
        i=wm_ynbox("Import Configuration Settings", "The configuration file \"%s\" was not found. "
604
        i=wm_ynbox("Import Configuration Settings", "The configuration file \"%s\" was not found. "
604
                   "Import configuration data from \"%s\"?",setupfilename,SETUPFILENAME);
605
                   "Import configuration data from \"%s\"?",setupfilename,SETUPFILENAME);
605
        if (i) ud.config.scripthandle = SCRIPT_Load(SETUPFILENAME);
606
        if (i) ud.config.scripthandle = SCRIPT_Load(SETUPFILENAME);
606
    }
607
    }
607
    else if (SafeFileExists("duke3d.cfg") && ud.config.scripthandle < 0)
608
    else if (SafeFileExists("duke3d.cfg") && ud.config.scripthandle < 0)
608
    {
609
    {
-
 
610
        int32_t i;
609
        i=wm_ynbox("Import Configuration Settings", "The configuration file \"%s\" was not found. "
611
        i=wm_ynbox("Import Configuration Settings", "The configuration file \"%s\" was not found. "
610
                   "Import configuration data from \"duke3d.cfg\"?",setupfilename);
612
                   "Import configuration data from \"duke3d.cfg\"?",setupfilename);
611
        if (i) ud.config.scripthandle = SCRIPT_Load("duke3d.cfg");
613
        if (i) ud.config.scripthandle = SCRIPT_Load("duke3d.cfg");
612
    }
614
    }
613
#endif
615
#endif