Rev 4436 | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 4436 | Rev 4440 | ||
|---|---|---|---|
| Line 38... | Line 38... | ||
| 38 | #include "osdfuncs.h"
|
38 | #include "osdfuncs.h"
|
| 39 | #ifdef _WIN32
|
39 | #ifdef _WIN32
|
| 40 | #include "winlayer.h"
|
40 | #include "winlayer.h"
|
| 41 | #endif
|
41 | #endif
|
| 42 | 42 | ||
| - | 43 | #ifdef __ANDROID__
|
|
| - | 44 | #include "android.h"
|
|
| - | 45 | #endif
|
|
| - | 46 | ||
| 43 | // we load this in to get default button and key assignments
|
47 | // we load this in to get default button and key assignments
|
| 44 | // as well as setting up function mappings
|
48 | // as well as setting up function mappings
|
| 45 | 49 | ||
| 46 | #define __SETUP__ // JBF 20031211
|
50 | #define __SETUP__ // JBF 20031211
|
| 47 | #include "_functio.h"
|
51 | #include "_functio.h"
|
| Line 568... | Line 572... | ||
| 568 | CONFIG_SetDefaults(); |
572 | CONFIG_SetDefaults(); |
| 569 | 573 | ||
| 570 | ud.config.setupread = 1; |
574 | ud.config.setupread = 1; |
| 571 | 575 | ||
| 572 | pathsearchmode = 1; |
576 | pathsearchmode = 1; |
| - | 577 | #ifndef __ANDROID__
|
|
| 573 | if (SafeFileExists(setupfilename) && ud.config.scripthandle < 0) // JBF 20031211 |
578 | if (SafeFileExists(setupfilename) && ud.config.scripthandle < 0) // JBF 20031211 |
| 574 | ud.config.scripthandle = SCRIPT_Load(setupfilename); |
579 | ud.config.scripthandle = SCRIPT_Load(setupfilename); |
| 575 | else if (SafeFileExists(SETUPFILENAME) && ud.config.scripthandle < 0) |
580 | else if (SafeFileExists(SETUPFILENAME) && ud.config.scripthandle < 0) |
| 576 | {
|
581 | {
|
| 577 | i=wm_ynbox("Import Configuration Settings", "The configuration file \"%s\" was not found. " |
582 | i=wm_ynbox("Import Configuration Settings", "The configuration file \"%s\" was not found. " |
| Line 582... | Line 587... | ||
| 582 | {
|
587 | {
|
| 583 | i=wm_ynbox("Import Configuration Settings", "The configuration file \"%s\" was not found. " |
588 | i=wm_ynbox("Import Configuration Settings", "The configuration file \"%s\" was not found. " |
| 584 | "Import configuration data from \"duke3d.cfg\"?",setupfilename); |
589 | "Import configuration data from \"duke3d.cfg\"?",setupfilename); |
| 585 | if (i) ud.config.scripthandle = SCRIPT_Load("duke3d.cfg"); |
590 | if (i) ud.config.scripthandle = SCRIPT_Load("duke3d.cfg"); |
| 586 | }
|
591 | }
|
| - | 592 | #endif
|
|
| - | 593 | ||
| 587 | pathsearchmode = 0; |
594 | pathsearchmode = 0; |
| 588 | 595 | ||
| 589 | if (ud.config.scripthandle < 0) return -1; |
596 | if (ud.config.scripthandle < 0) return -1; |
| 590 | 597 | ||
| 591 | if (ud.config.scripthandle >= 0) |
598 | if (ud.config.scripthandle >= 0) |