Mercurial > hg > openttd

changeset 18735:e19009415726 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r23583) -Codechange: prevent name collision with strgen variable
author rubidium <rubidium@openttd.org>
date Sat, 17 Dec 2011 22:35:22 +0000
parents efed00454d8b
children 50131accbd57
files src/error_gui.cpp
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/error_gui.cpp
+++ b/src/error_gui.cpp
@@ -134,7 +134,7 @@
 /** Define a queue with errors. */
 typedef std::list<ErrorMessageData> ErrorList;
 /** The actual queue with errors. */
-ErrorList _errors;
+ErrorList _error_list;
 /** Whether the window system is initialized or not. */
 bool _window_system_initialized = false;
 
@@ -297,16 +297,16 @@
 void ClearErrorMessages()
 {
 	UnshowCriticalError();
-	_errors.clear();
+	_error_list.clear();
 }
 
 /** Show the first error of the queue. */
 void ShowFirstError()
 {
 	_window_system_initialized = true;
-	if (!_errors.empty()) {
-		new ErrmsgWindow(_errors.front());
-		_errors.pop_front();
+	if (!_error_list.empty()) {
+		new ErrmsgWindow(_error_list.front());
+		_error_list.pop_front();
 	}
 }
 
@@ -319,7 +319,7 @@
 {
 	ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0);
 	if (_window_system_initialized && w != NULL) {
-		if (w->IsCritical()) _errors.push_front(*w);
+		if (w->IsCritical()) _error_list.push_front(*w);
 		_window_system_initialized = false;
 		delete w;
 	}
@@ -372,7 +372,7 @@
 		if (wl == WL_CRITICAL) {
 			/* Push another critical error in the queue of errors,
 			 * but do not put other errors in the queue. */
-			_errors.push_back(data);
+			_error_list.push_back(data);
 		}
 	} else {
 		/* Nothing or a non-critical error was shown. */