From 44aacfc59f06106acc492dda7b514db5c7f082ca Mon Sep 17 00:00:00 2001 From: alberth Date: Sat, 31 Oct 2009 19:46:51 +0000 Subject: (svn r17928) -Codechange: ShowErrorMessage() now takes the summary string before the details string. Gentlemen, swap your string parameters. --- src/ai/ai_gui.cpp | 6 +++--- src/ai/ai_instance.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/ai') diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index 355cbbb00..e100b456c 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -178,7 +178,7 @@ struct AIListWindow : public Window { case AIL_WIDGET_CONTENT_DOWNLOAD: if (!_network_available) { - ShowErrorMessage(INVALID_STRING_ID, STR_NETWORK_ERROR_NOTAVAILABLE, 0, 0); + ShowErrorMessage(STR_NETWORK_ERROR_NOTAVAILABLE, INVALID_STRING_ID, 0, 0); } else { #if defined(ENABLE_NETWORK) ShowNetworkContentListWindow(NULL, CONTENT_TYPE_AI); @@ -365,7 +365,7 @@ struct AISettingsWindow : public Window { if (_settings_newgame.difficulty.diff_level != 3) { _settings_newgame.difficulty.diff_level = 3; - ShowErrorMessage(INVALID_STRING_ID, STR_WARNING_DIFFICULTY_TO_CUSTOM, 0, 0); + ShowErrorMessage(STR_WARNING_DIFFICULTY_TO_CUSTOM, INVALID_STRING_ID, 0, 0); } } else if (!bool_item) { /* Display a query box so users can enter a custom value. */ @@ -962,6 +962,6 @@ void ShowAIDebugWindow(CompanyID show_company) if (w == NULL) w = new AIDebugWindow(&_ai_debug_desc, 0); if (show_company != INVALID_COMPANY) w->ChangeToAI(show_company); } else { - ShowErrorMessage(INVALID_STRING_ID, STR_ERROR_AI_DEBUG_SERVER_ONLY, 0, 0); + ShowErrorMessage(STR_ERROR_AI_DEBUG_SERVER_ONLY, INVALID_STRING_ID, 0, 0); } } diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp index d55ca085d..6ebaae46c 100644 --- a/src/ai/ai_instance.cpp +++ b/src/ai/ai_instance.cpp @@ -304,7 +304,7 @@ void AIInstance::Died() const AIInfo *info = AIConfig::GetConfig(_current_company)->GetInfo(); if (info != NULL) { - ShowErrorMessage(INVALID_STRING_ID, STR_ERROR_AI_PLEASE_REPORT_CRASH, 0, 0); + ShowErrorMessage(STR_ERROR_AI_PLEASE_REPORT_CRASH, INVALID_STRING_ID, 0, 0); if (info->GetURL() != NULL) { AILog::Info("Please report the error to the following URL:"); -- cgit v1.2.3-70-g09d2