From 9aab2dc861ba8fd4dfabf63ff2ebb51d5261ef85 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 10 Dec 2011 13:54:10 +0000 Subject: [PATCH] (svn r23474) -Codechange: move the declaration error related functions to error.h --- projects/openttd_vs100.vcxproj | 1 + projects/openttd_vs100.vcxproj.filters | 3 +++ projects/openttd_vs80.vcproj | 4 ++++ projects/openttd_vs90.vcproj | 4 ++++ source.list | 1 + src/ai/ai_gui.cpp | 1 + src/ai/ai_instance.cpp | 2 +- src/bridge_gui.cpp | 2 +- src/command.cpp | 1 + src/company_gui.cpp | 1 + src/error.h | 27 ++++++++++++++++++++++++++ src/error_gui.cpp | 2 +- src/fios_gui.cpp | 1 + src/gui.h | 10 ---------- src/heightmap.cpp | 2 +- src/industry_gui.cpp | 1 + src/intro_gui.cpp | 1 + src/misc_gui.cpp | 1 + src/music_gui.cpp | 2 +- src/network/network_client.cpp | 2 +- src/network/network_content.cpp | 2 +- src/network/network_content_gui.cpp | 2 +- src/newgrf.cpp | 2 +- src/newgrf_commons.cpp | 2 +- src/newgrf_gui.cpp | 1 + src/newgrf_industries.cpp | 2 +- src/openttd.cpp | 1 + src/saveload/saveload.cpp | 2 +- src/screenshot.cpp | 2 +- src/settings.cpp | 2 +- src/settings_gui.cpp | 1 + src/spriteloader/grf.cpp | 2 +- src/strings.cpp | 2 +- src/town_cmd.cpp | 2 +- src/town_gui.cpp | 1 + src/train_cmd.cpp | 2 +- src/vehicle.cpp | 2 +- 37 files changed, 70 insertions(+), 29 deletions(-) create mode 100644 src/error.h diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj index 940b809c8f..783bf2ee7d 100644 --- a/projects/openttd_vs100.vcxproj +++ b/projects/openttd_vs100.vcxproj @@ -428,6 +428,7 @@ + diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters index 9c5ebfcf23..0ccd7e7581 100644 --- a/projects/openttd_vs100.vcxproj.filters +++ b/projects/openttd_vs100.vcxproj.filters @@ -507,6 +507,9 @@ Header Files + + Header Files + Header Files diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index e117f901c1..5e183e8833 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -986,6 +986,10 @@ RelativePath=".\..\src\engine_type.h" > + + diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index 2898eb7565..f5a0558429 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -983,6 +983,10 @@ RelativePath=".\..\src\engine_type.h" > + + diff --git a/source.list b/source.list index 185859af89..628153da44 100644 --- a/source.list +++ b/source.list @@ -161,6 +161,7 @@ engine_base.h engine_func.h engine_gui.h engine_type.h +error.h fileio_func.h fileio_type.h fios.h diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp index a71e018e98..7d7ca7d575 100644 --- a/src/ai/ai_gui.cpp +++ b/src/ai/ai_gui.cpp @@ -11,6 +11,7 @@ #include "../stdafx.h" #include "../table/sprites.h" +#include "../error.h" #include "../gui.h" #include "../querystring_gui.h" #include "../company_func.h" diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp index a3131b45be..df2aef9bc3 100644 --- a/src/ai/ai_instance.cpp +++ b/src/ai/ai_instance.cpp @@ -12,7 +12,7 @@ #include "../stdafx.h" #include "../debug.h" #include "../saveload/saveload.h" -#include "../gui.h" +#include "../error.h" #include "../script/squirrel_class.hpp" diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp index 9971951ca6..0a0d788d4c 100644 --- a/src/bridge_gui.cpp +++ b/src/bridge_gui.cpp @@ -10,7 +10,7 @@ /** @file bridge_gui.cpp Graphical user interface for bridge construction */ #include "stdafx.h" -#include "gui.h" +#include "error.h" #include "command_func.h" #include "rail.h" #include "strings_func.h" diff --git a/src/command.cpp b/src/command.cpp index d521cda0e2..31c4843f0e 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -11,6 +11,7 @@ #include "stdafx.h" #include "landscape.h" +#include "error.h" #include "gui.h" #include "command_func.h" #include "network/network_type.h" diff --git a/src/company_gui.cpp b/src/company_gui.cpp index 4a6bab0a3f..4e364f74e7 100644 --- a/src/company_gui.cpp +++ b/src/company_gui.cpp @@ -10,6 +10,7 @@ /** @file company_gui.cpp Company related GUIs. */ #include "stdafx.h" +#include "error.h" #include "gui.h" #include "window_gui.h" #include "textbuf_gui.h" diff --git a/src/error.h b/src/error.h new file mode 100644 index 0000000000..75efb75b80 --- /dev/null +++ b/src/error.h @@ -0,0 +1,27 @@ +/* $Id$ */ + +/* + * This file is part of OpenTTD. + * OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2. + * OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see . + */ + +/** @file error.h Functions related to errors. */ + +#ifndef ERROR_H +#define ERROR_H + +#include "strings_type.h" + +/** Message severity/type */ +enum WarningLevel { + WL_INFO, ///< Used for DoCommand-like (and some nonfatal AI GUI) errors/information + WL_WARNING, ///< Other information + WL_ERROR, ///< Errors (eg. saving/loading failed) + WL_CRITICAL, ///< Critical errors, the MessageBox is shown in all cases +}; + +void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel wl, int x = 0, int y = 0, uint textref_stack_size = 0, const uint32 *textref_stack = NULL); + +#endif /* ERROR_H */ diff --git a/src/error_gui.cpp b/src/error_gui.cpp index a487f0f2ae..d02ebc15c5 100644 --- a/src/error_gui.cpp +++ b/src/error_gui.cpp @@ -12,7 +12,7 @@ #include "stdafx.h" #include "landscape.h" #include "newgrf_text.h" -#include "gui.h" +#include "error.h" #include "viewport_func.h" #include "gfx_func.h" #include "string_func.h" diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp index 5370cfd293..4a56d2ce6f 100644 --- a/src/fios_gui.cpp +++ b/src/fios_gui.cpp @@ -11,6 +11,7 @@ #include "stdafx.h" #include "saveload/saveload.h" +#include "error.h" #include "gui.h" #include "gfx_func.h" #include "command_func.h" diff --git a/src/gui.h b/src/gui.h index 823423575f..4859fe79e8 100644 --- a/src/gui.h +++ b/src/gui.h @@ -55,16 +55,6 @@ void ShowSubsidiesList(); void ShowEstimatedCostOrIncome(Money cost, int x, int y); -/** Message severity/type */ -enum WarningLevel { - WL_INFO, ///< Used for DoCommand-like (and some nonfatal AI GUI) errors/information - WL_WARNING, ///< Other information - WL_ERROR, ///< Errors (eg. saving/loading failed) - WL_CRITICAL, ///< Critical errors, the MessageBox is shown in all cases -}; - -void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel wl, int x = 0, int y = 0, uint textref_stack_size = 0, const uint32 *textref_stack = NULL); - void ShowExtraViewPortWindow(TileIndex tile = INVALID_TILE); void ShowExtraViewPortWindowForTileUnderCursor(); diff --git a/src/heightmap.cpp b/src/heightmap.cpp index c05e7365cd..1e6531fb0c 100644 --- a/src/heightmap.cpp +++ b/src/heightmap.cpp @@ -13,7 +13,7 @@ #include "heightmap.h" #include "clear_map.h" #include "void_map.h" -#include "gui.h" +#include "error.h" #include "saveload/saveload.h" #include "bmp.h" #include "gfx_func.h" diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp index 9c2e825f6f..7a5a588630 100644 --- a/src/industry_gui.cpp +++ b/src/industry_gui.cpp @@ -10,6 +10,7 @@ /** @file industry_gui.cpp GUIs related to industries. */ #include "stdafx.h" +#include "error.h" #include "gui.h" #include "sound_func.h" #include "window_func.h" diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp index 894f54dc47..388587fb22 100644 --- a/src/intro_gui.cpp +++ b/src/intro_gui.cpp @@ -10,6 +10,7 @@ /** @file intro_gui.cpp The main menu GUI. */ #include "stdafx.h" +#include "error.h" #include "gui.h" #include "window_gui.h" #include "textbuf_gui.h" diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp index 5e16f1185e..3ea9dff0fd 100644 --- a/src/misc_gui.cpp +++ b/src/misc_gui.cpp @@ -12,6 +12,7 @@ #include "stdafx.h" #include "debug.h" #include "landscape.h" +#include "error.h" #include "gui.h" #include "viewport_func.h" #include "gfx_func.h" diff --git a/src/music_gui.cpp b/src/music_gui.cpp index 846c2bcb69..d4c3057dea 100644 --- a/src/music_gui.cpp +++ b/src/music_gui.cpp @@ -19,7 +19,7 @@ #include "sound_func.h" #include "gfx_func.h" #include "core/random_func.hpp" -#include "gui.h" +#include "error.h" #include "core/geometry_func.hpp" #include "string_func.h" #include "settings_type.h" diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 5e03e638a6..cc6c79e8ed 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -26,7 +26,7 @@ #include "../core/random_func.hpp" #include "../date_func.h" #include "../gfx_func.h" -#include "../gui.h" +#include "../error.h" #include "../rev.h" #include "network.h" #include "network_base.h" diff --git a/src/network/network_content.cpp b/src/network/network_content.cpp index 98c9f171b3..179603768c 100644 --- a/src/network/network_content.cpp +++ b/src/network/network_content.cpp @@ -15,7 +15,7 @@ #include "../rev.h" #include "../ai/ai.hpp" #include "../window_func.h" -#include "../gui.h" +#include "../error.h" #include "../base_media_base.h" #include "../settings_type.h" #include "network_content.h" diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp index 3b008832d3..fa16238b2e 100644 --- a/src/network/network_content_gui.cpp +++ b/src/network/network_content_gui.cpp @@ -14,7 +14,7 @@ #include "../strings_func.h" #include "../gfx_func.h" #include "../window_func.h" -#include "../gui.h" +#include "../error.h" #include "../ai/ai.hpp" #include "../base_media_base.h" #include "../sortlist_type.h" diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 49e8cf3eb0..52de2703cb 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -45,7 +45,7 @@ #include #include "smallmap_gui.h" #include "genworld.h" -#include "gui.h" +#include "error.h" #include "vehicle_func.h" #include "language.h" #include "vehicle_base.h" diff --git a/src/newgrf_commons.cpp b/src/newgrf_commons.cpp index 0e28ce768d..d25e3245e8 100644 --- a/src/newgrf_commons.cpp +++ b/src/newgrf_commons.cpp @@ -29,7 +29,7 @@ #include "newgrf_text.h" #include "livery.h" #include "company_base.h" -#include "gui.h" +#include "error.h" #include "strings_func.h" #include "table/strings.h" diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp index 7b3604157f..64e4df7f60 100644 --- a/src/newgrf_gui.cpp +++ b/src/newgrf_gui.cpp @@ -10,6 +10,7 @@ /** @file newgrf_gui.cpp GUI to change NewGRF settings. */ #include "stdafx.h" +#include "error.h" #include "gui.h" #include "newgrf.h" #include "strings_func.h" diff --git a/src/newgrf_industries.cpp b/src/newgrf_industries.cpp index 38daaa09be..1847845202 100644 --- a/src/newgrf_industries.cpp +++ b/src/newgrf_industries.cpp @@ -21,7 +21,7 @@ #include "town.h" #include "company_base.h" #include "command_func.h" -#include "gui.h" +#include "error.h" #include "strings_func.h" #include "core/random_func.hpp" diff --git a/src/openttd.cpp b/src/openttd.cpp index dd93ffc68c..464330581a 100644 --- a/src/openttd.cpp +++ b/src/openttd.cpp @@ -17,6 +17,7 @@ #include "video/video_driver.hpp" #include "fontcache.h" +#include "error.h" #include "gui.h" #include "sound_func.h" #include "window_func.h" diff --git a/src/saveload/saveload.cpp b/src/saveload/saveload.cpp index c603f58436..5efc187a87 100644 --- a/src/saveload/saveload.cpp +++ b/src/saveload/saveload.cpp @@ -41,7 +41,7 @@ #include "../string_func.h" #include "../engine_base.h" #include "../fios.h" -#include "../gui.h" +#include "../error.h" #include "table/strings.h" diff --git a/src/screenshot.cpp b/src/screenshot.cpp index 5e8bf59718..9f8174208e 100644 --- a/src/screenshot.cpp +++ b/src/screenshot.cpp @@ -20,7 +20,7 @@ #include "saveload/saveload.h" #include "company_func.h" #include "strings_func.h" -#include "gui.h" +#include "error.h" #include "window_gui.h" #include "window_func.h" #include "tile_map.h" diff --git a/src/settings.cpp b/src/settings.cpp index d8067574b2..e9d4a17ded 100644 --- a/src/settings.cpp +++ b/src/settings.cpp @@ -45,7 +45,7 @@ #include "textbuf_gui.h" #include "rail_gui.h" #include "elrail_func.h" -#include "gui.h" +#include "error.h" #include "town.h" #include "video/video_driver.hpp" #include "sound/sound_driver.hpp" diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp index 4a4282ea77..6ea6f0b221 100644 --- a/src/settings_gui.cpp +++ b/src/settings_gui.cpp @@ -11,6 +11,7 @@ #include "stdafx.h" #include "currency.h" +#include "error.h" #include "gui.h" #include "textbuf_gui.h" #include "command_func.h" diff --git a/src/spriteloader/grf.cpp b/src/spriteloader/grf.cpp index b4533ae944..a4de26244d 100644 --- a/src/spriteloader/grf.cpp +++ b/src/spriteloader/grf.cpp @@ -15,7 +15,7 @@ #include "../debug.h" #include "../strings_func.h" #include "table/strings.h" -#include "../gui.h" +#include "../error.h" #include "../core/math_func.hpp" #include "grf.hpp" diff --git a/src/strings.cpp b/src/strings.cpp index e15d30e009..d34d053fad 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -23,7 +23,7 @@ #include "signs_base.h" #include "cargotype.h" #include "fontcache.h" -#include "gui.h" +#include "error.h" #include "strings_func.h" #include "rev.h" #include "core/alloc_type.hpp" diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 60bb58e098..4413092d3f 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -20,7 +20,7 @@ #include "station_base.h" #include "company_base.h" #include "news_func.h" -#include "gui.h" +#include "error.h" #include "object.h" #include "genworld.h" #include "newgrf_debug.h" diff --git a/src/town_gui.cpp b/src/town_gui.cpp index f5c6747bf6..50ecce2de6 100644 --- a/src/town_gui.cpp +++ b/src/town_gui.cpp @@ -12,6 +12,7 @@ #include "stdafx.h" #include "town.h" #include "viewport_func.h" +#include "error.h" #include "gui.h" #include "command_func.h" #include "company_func.h" diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp index 440ff9bdbd..8af59b7412 100644 --- a/src/train_cmd.cpp +++ b/src/train_cmd.cpp @@ -10,7 +10,7 @@ /** @file train_cmd.cpp Handling of trains. */ #include "stdafx.h" -#include "gui.h" +#include "error.h" #include "articulated_vehicles.h" #include "command_func.h" #include "pathfinder/npf/npf_func.h" diff --git a/src/vehicle.cpp b/src/vehicle.cpp index aa03194660..d584418657 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -10,7 +10,7 @@ /** @file vehicle.cpp Base implementations of all vehicles. */ #include "stdafx.h" -#include "gui.h" +#include "error.h" #include "roadveh.h" #include "ship.h" #include "spritecache.h"