Mercurial > hg > openttd

changeset 5576:dbf35fe9cff5 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r8013) -Codechange (r6921, rUnknown): Show the error message of corrupt or missing (own) files through a ShowInfo(F). This way windows users also see this message and bugs such as FS#528 will not happen anymore. Put ShowInfo(F) error output to stderr and not stdout.
author Darkvater <Darkvater@openttd.org>
date Tue, 09 Jan 2007 21:25:13 +0000
parents a86459ca8e21
children 19eb817617a0
files src/gfxinit.c src/music_gui.c src/openttd.c src/settings.c src/unix.c src/win32.c
diffstat 6 files changed, 8 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/gfxinit.c
+++ b/src/gfxinit.c
@@ -174,11 +174,11 @@
 	for (i = 0; i < 3; i++) if (FileMD5(files_win.landscape[i], true)) win++;
 
 	if (!FileMD5(sample_cat_win, false) && !FileMD5(sample_cat_dos, false))
-		fprintf(stderr, "Your sample.cat file is corrupted or missing!\n");
+		ShowInfo("Your 'sample.cat' file is corrupted or missing!");
 
 	for (i = 0; i < lengthof(files_openttd); i++) {
 		if (!FileMD5(files_openttd[i], false)) {
-			fprintf(stderr, "Your %s file is corrupted or missing!\n", files_openttd[i].filename);
+			ShowInfoF("Your '%s' file is corrupted or missing!", files_openttd[i].filename);
 		}
 	}
 
--- a/src/music_gui.c
+++ b/src/music_gui.c
@@ -288,7 +288,7 @@
 
 #if 0
 		case 12: // save
-			ShowInfo("MusicTrackSelectionWndProc:save not implemented\n");
+			ShowInfo("MusicTrackSelectionWndProc:save not implemented");
 			break;
 #endif
 
--- a/src/openttd.c
+++ b/src/openttd.c
@@ -165,8 +165,7 @@
 		"  -i                  = Force to use the DOS palette\n"
 		"                          (use this if you see a lot of pink)\n"
 		"  -c config_file      = Use 'config_file' instead of 'openttd.cfg'\n"
-		"  -x                  = Do not automatically save to config file on exit\n"
-		"\n",
+		"  -x                  = Do not automatically save to config file on exit\n",
 		lastof(buf)
 	);
 
--- a/src/settings.c
+++ b/src/settings.c
@@ -247,7 +247,7 @@
 		// it's a group?
 		if (s[0] == '[') {
 			if (e[-1] != ']') {
-				ShowInfoF("ini: invalid group name '%s'\n", buffer);
+				ShowInfoF("ini: invalid group name '%s'", buffer);
 			} else {
 				e--;
 			}
@@ -282,7 +282,7 @@
 			item->value = pool_strdup(&ini->pool, t, e - t);
 		} else {
 			// it's an orphan item
-			ShowInfoF("ini: '%s' outside of group\n", buffer);
+			ShowInfoF("ini: '%s' outside of group", buffer);
 		}
 	}
 
--- a/src/unix.c
+++ b/src/unix.c
@@ -111,7 +111,7 @@
 
 void ShowInfo(const char *str)
 {
-	puts(str);
+	fprintf(stderr, str);
 }
 
 void ShowOSErrorBox(const char *buf)
--- a/src/win32.c
+++ b/src/win32.c
@@ -836,7 +836,7 @@
 void ShowInfo(const char *str)
 {
 	if (_has_console) {
-		puts(str);
+		fprintf(stderr, str);
 	} else {
 		bool old;