mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r23583) -Codechange: prevent name collision with strgen variable

release/1.2
rubidium 2011-12-17 22:35:22 +00:00
parent ab974bee97
commit 8c6a37d4b4
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/error_gui.cpp
View File

@ -134,7 +134,7 @@ public:
/** Define a queue with errors. */ /** Define a queue with errors. */
typedef std::list<ErrorMessageData> ErrorList; typedef std::list<ErrorMessageData> ErrorList;
/** The actual queue with errors. */ /** The actual queue with errors. */
ErrorList _errors; ErrorList _error_list;
/** Whether the window system is initialized or not. */ /** Whether the window system is initialized or not. */
bool _window_system_initialized = false; bool _window_system_initialized = false;
@ -297,16 +297,16 @@ public:
void ClearErrorMessages() void ClearErrorMessages()
{ {
UnshowCriticalError(); UnshowCriticalError();
_errors.clear(); _error_list.clear();
} }
/** Show the first error of the queue. */ /** Show the first error of the queue. */
void ShowFirstError() void ShowFirstError()
{ {
_window_system_initialized = true; _window_system_initialized = true;
if (!_errors.empty()) { if (!_error_list.empty()) {
new ErrmsgWindow(_errors.front()); new ErrmsgWindow(_error_list.front());
_errors.pop_front(); _error_list.pop_front();
} }
} }
@ -319,7 +319,7 @@ void UnshowCriticalError()
{ {
ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0); ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0);
if (_window_system_initialized && w != NULL) { 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; _window_system_initialized = false;
delete w; delete w;
} }
@ -372,7 +372,7 @@ void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel
if (wl == WL_CRITICAL) { if (wl == WL_CRITICAL) {
/* Push another critical error in the queue of errors, /* Push another critical error in the queue of errors,
* but do not put other errors in the queue. */ * but do not put other errors in the queue. */
_errors.push_back(data); _error_list.push_back(data);
} }
} else { } else {
/* Nothing or a non-critical error was shown. */ /* Nothing or a non-critical error was shown. */