Simplify the interface of dr_fatal_notify().

- Remove the parameter choices, because all callers pass in 0.
- Remove the return value, because no caller uses it.

git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@4937 8aca7d54-2c30-db11-9de9-000461428c89

simmain.cc

@@ -687,7 +687,7 @@ int simu_main(int argc, char** argv)
 		if(  umgebung_t::objfilename.empty()  ) {
 			// nothing to be loaded => exit
 			fprintf(stderr, "*** No pak set found ***\n\nMost likely, you have no pak set installed.\nPlease download and install also graphics (pak).\n");
-			dr_fatal_notify( "*** No pak set found ***\n\nMost likely, you have no pak set installed.\nPlease download and install also graphcis (pak).\n", 0 );
+			dr_fatal_notify("*** No pak set found ***\n\nMost likely, you have no pak set installed.\nPlease download and install also graphcis (pak).\n");
 			simgraph_exit();
 			return 0;
 		}

simsys.h

@@ -112,8 +112,7 @@ unsigned long dr_time(void);
 void dr_sleep(uint32 millisec);
 
 // error message in case of fatal events
-// if choice!=0 then there will be a scond button
-bool dr_fatal_notify(const char* msg, int choices);
+void dr_fatal_notify(char const* msg);
 
 /**
  * Some wrappers can save screenshots.

simsys_d.cc

@@ -217,7 +217,7 @@ int dr_os_init(const int* parameter)
 	set_close_button_callback(my_close_button_callback);
 
 	if (ok != 0) {
-		dr_fatal_notify("Could not init Allegro.\n",0);
+		dr_fatal_notify("Could not init Allegro.\n");
 	}
 	simtimer_init();
 
@@ -493,7 +493,7 @@ static void simtimer_init(void)
 		printf("Timer installed.\n");
 	}
 	else {
-		dr_fatal_notify("Error: Timer not available, aborting.\n",0);
+		dr_fatal_notify("Error: Timer not available, aborting.\n");
 		exit(1);
 	}
 }
@@ -511,19 +511,10 @@ void dr_sleep(uint32 usec)
 }
 
 
-bool dr_fatal_notify(const char* msg, int choices)
+void dr_fatal_notify(char const* const msg)
 {
 #ifdef _WIN32
-	if(choices==0) {
-		MessageBox( NULL, msg, "Fatal Error", MB_ICONEXCLAMATION|MB_OK );
-		return 0;
-	}
-	else {
-		return MessageBox( NULL, msg, "Fatal Error", MB_ICONEXCLAMATION|MB_RETRYCANCEL	)==IDRETRY;
-	}
-#else
-//	beep();
-	return choices;
+	MessageBox(0, msg, "Fatal Error", MB_ICONEXCLAMATION | MB_OK);
 #endif
 }
 

simsys_posix.cc

@@ -166,12 +166,13 @@ void dr_sleep(uint32 msec)
 #endif
 }
 
-bool dr_fatal_notify(const char* msg, int choices)
+
+void dr_fatal_notify(char const* const msg)
 {
 	fputs(msg, stderr);
-	return choices;
 }
 
+
 int main(int argc, char **argv)
 {
 #ifdef _WIN32

simsys_s.cc

@@ -620,19 +620,12 @@ void dr_sleep(uint32 usec)
 }
 
 
-bool dr_fatal_notify(const char* msg, int choices)
+void dr_fatal_notify(char const* const msg)
 {
 #ifdef _WIN32
-	if(choices==0) {
-		MessageBoxA( NULL, msg, "Fatal Error", MB_ICONEXCLAMATION|MB_OK );
-		return 0;
-	}
-	else {
-		return MessageBoxA( NULL, msg, "Fatal Error", MB_ICONEXCLAMATION|MB_RETRYCANCEL	)==IDRETRY;
-	}
+	MessageBoxA(0, msg, "Fatal Error", MB_ICONEXCLAMATION | MB_OK);
 #else
 	fputs(msg, stderr);
-	return choices;
 #endif
 }
 

simsys_w.cc

@@ -736,16 +736,9 @@ void dr_sleep(uint32 millisec)
 }
 
 
-
-bool dr_fatal_notify(const char* msg, int choices)
+void dr_fatal_notify(char const* const msg)
 {
-	if(choices==0) {
-		MessageBoxA( hwnd, msg, "Fatal Error", MB_ICONEXCLAMATION|MB_OK );
-		return 0;
-	}
-	else {
-		return MessageBoxA( hwnd, msg, "Fatal Error", MB_ICONEXCLAMATION|MB_RETRYCANCEL	)==IDRETRY;
-	}
+	MessageBoxA(hwnd, msg, "Fatal Error", MB_ICONEXCLAMATION | MB_OK);
 }
 
 

utils/log.cc

@@ -242,7 +242,7 @@ void log_t::fatal(const char *who, const char *format, ...)
 	}
 	else {
 		// use OS means, if there
-		dr_fatal_notify( buffer, 0 );
+		dr_fatal_notify(buffer);
 	}
 
 #ifdef DEBUG