claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AT NVR writes now again correctly set NMI mask;

Browse Source 
If no VM path is specified or the specified VM path is relative, it is now converted to absolute using exe_path;
Fixed saving path for screenshots when using the DirectDraw renderer.
This commit is contained in:
OBattler
2017-11-24 13:14:09 +01:00
parent ce1bab2967
commit 0009d4a1c3
4 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/pc.c
View File

@@ -337,6 +337,20 @@ get_actual_size_y(void)
}
void cfg_path_slash(void)
{
/* Make sure cfg_path has a trailing backslash. */
if ((cfg_path[wcslen(cfg_path)-1] != L'\\') &&
(cfg_path[wcslen(cfg_path)-1] != L'/')) {
#ifdef _WIN32
wcscat(cfg_path, L"\\");
#else
wcscat(cfg_path, L"/");
#endif
}
}
/*
* Perform initial startup of the PC.
*
@@ -352,6 +366,8 @@ pc_init(int argc, wchar_t *argv[])
struct tm *info;
time_t now;
int c;
int cfgp = 0;
wchar_t cmdl_cfg_path[2048];
/* Grab the executable's full path. */
plat_get_exe_name(exe_path, sizeof(exe_path)-1);
@@ -410,7 +426,8 @@ usage:
!wcscasecmp(argv[c], L"-P")) {
if ((c+1) == argc) goto usage;
wcscpy(cfg_path, argv[++c]);
wcscpy(cmdl_cfg_path, argv[++c]);
cfgp = 1;
#ifdef USE_WX
} else if (!wcscasecmp(argv[c], L"--fps") ||
!wcscasecmp(argv[c], L"-R")) {
@@ -434,16 +451,20 @@ usage:
cfg = argv[c++];
if (c != argc) goto usage;
/* Make sure cfg_path has a trailing backslash. */
if ((cfg_path[wcslen(cfg_path)-1] != L'\\') &&
(cfg_path[wcslen(cfg_path)-1] != L'/')) {
#ifdef _WIN32
wcscat(cfg_path, L"\\");
#else
wcscat(cfg_path, L"/");
#endif
if (!cfgp) {
wcscpy(cfg_path, exe_path);
} else {
if ((cmdl_cfg_path[0] != L'\\') && (cmdl_cfg_path[0] != L'/') && (cmdl_cfg_path[1] != L':')) {
wcscpy(cfg_path, exe_path);
cfg_path_slash();
wcscat(cfg_path, cmdl_cfg_path);
} else {
wcscpy(cfg_path, cmdl_cfg_path);
}
}
cfg_path_slash();
if (cfg != NULL) {
/*
* The user specified a configuration file.