X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Flibgame%2Fmisc.c;h=8bc69396cb464a0ad20b666dbced14501277c85e;hp=acada2472e9754f5e15b775b0e74fae3832823f7;hb=463778af29aada177d4a00c566653b92be3b507a;hpb=2fc3381a6d44fe617388ac019170910e337bb07e diff --git a/src/libgame/misc.c b/src/libgame/misc.c index acada247..8bc69396 100644 --- a/src/libgame/misc.c +++ b/src/libgame/misc.c @@ -635,7 +635,7 @@ void Error(int mode, char *format, ...) if (mode & ERR_WARN && !options.verbose) return; -#if !defined(PLATFORM_UNIX) +#if defined(PLATFORM_MSDOS) newline = "\r\n"; if ((error = openErrorFile()) == NULL) @@ -1265,44 +1265,27 @@ boolean FileIsArtworkType(char *basename, int type) /* ========================================================================= */ -/* functions only needed for non-Unix (non-command-line) systems */ +/* functions only needed for non-Unix (non-command-line) systems */ +/* (MS-DOS only; SDL/Windows creates files "stdout.txt" and "stderr.txt") */ /* ========================================================================= */ -#if !defined(PLATFORM_UNIX) +#if defined(PLATFORM_MSDOS) -#define ERROR_FILENAME "error.out" +#define ERROR_FILENAME "stderr.txt" void initErrorFile() { - char *filename; - - InitUserDataDirectory(); - - filename = getPath2(getUserDataDir(), ERROR_FILENAME); - unlink(filename); - free(filename); + unlink(ERROR_FILENAME); } FILE *openErrorFile() { - char *filename; - FILE *error_file; - - filename = getPath2(getUserDataDir(), ERROR_FILENAME); - error_file = fopen(filename, MODE_APPEND); - free(filename); - - return error_file; + return fopen(ERROR_FILENAME, MODE_APPEND); } void dumpErrorFile() { - char *filename; - FILE *error_file; - - filename = getPath2(getUserDataDir(), ERROR_FILENAME); - error_file = fopen(filename, MODE_READ); - free(filename); + FILE *error_file = fopen(ERROR_FILENAME, MODE_READ); if (error_file != NULL) {