cpp/openttd-patchpack/source Changeset - r18617:524f2e0f54dc

Changeset - r18617:524f2e0f54dc

Parent rev.

Child rev.

[Not reviewed]

master

0 36 1

rubidium - 13 years ago 2011-12-10 13:54:10
rubidium@openttd.org

(svn r23474) -Codechange: move the declaration error related functions to error.h

37 files changed with 70 insertions and 29 deletions:

projects/openttd_vs100.vcxproj

projects/openttd_vs100.vcxproj.filters

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

source.list

src/ai/ai_gui.cpp

src/ai/ai_instance.cpp

src/bridge_gui.cpp

src/command.cpp

src/company_gui.cpp

src/error.h

src/error_gui.cpp

src/fios_gui.cpp

src/gui.h

src/heightmap.cpp

src/industry_gui.cpp

src/intro_gui.cpp

src/misc_gui.cpp

src/music_gui.cpp

src/network/network_client.cpp

src/network/network_content.cpp

src/network/network_content_gui.cpp

src/newgrf.cpp

src/newgrf_commons.cpp

src/newgrf_gui.cpp

src/newgrf_industries.cpp

src/openttd.cpp

src/saveload/saveload.cpp

src/screenshot.cpp

src/settings.cpp

src/settings_gui.cpp

src/spriteloader/grf.cpp

src/strings.cpp

src/town_cmd.cpp

src/town_gui.cpp

src/train_cmd.cpp

src/vehicle.cpp

0 comments (0 inline, 0 general)

projects/openttd_vs100.vcxproj

➞

Show inline comments

@@ @@ -428,6 +428,7 @@ @@
     <ClInclude Include="..\src\engine_func.h" />
     <ClInclude Include="..\src\engine_gui.h" />
     <ClInclude Include="..\src\engine_type.h" />
     <ClInclude Include="..\src\error.h" />
     <ClInclude Include="..\src\fileio_func.h" />
     <ClInclude Include="..\src\fileio_type.h" />
     <ClInclude Include="..\src\fios.h" />

projects/openttd_vs100.vcxproj.filters

➞

Show inline comments

@@ @@ -507,6 +507,9 @@ @@
     <ClInclude Include="..\src\engine_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\error.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="..\src\fileio_func.h">
       <Filter>Header Files</Filter>
     </ClInclude>

projects/openttd_vs80.vcproj

➞

Show inline comments

@@ @@ -987,6 +987,10 @@ @@
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\error.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\fileio_func.h"
+				>
 			</File>

projects/openttd_vs90.vcproj

➞

Show inline comments

@@ @@ -984,6 +984,10 @@ @@
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\error.h"
+				>
 			</File>
 			<File
 				RelativePath=".\..\src\fileio_func.h"
+				>
 			</File>

source.list

➞

Show inline comments

@@ @@ -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

src/ai/ai_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/ai/ai_instance.cpp

➞

Show inline comments

@@ @@ -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"

src/bridge_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/command.cpp

➞

Show inline comments

@@ @@ -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"

src/company_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/error.h

➞

Show inline comments

@@ new file 100644 @@
 /* $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 <http://www.gnu.org/licenses/>.
  */
 /** @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 */

src/error_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/fios_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/gui.h

➞

Show inline comments

@@ @@ -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();

src/heightmap.cpp

➞

Show inline comments

@@ @@ -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"

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/intro_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/misc_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/music_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/network/network_client.cpp

➞

Show inline comments

@@ @@ -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"

src/network/network_content.cpp

➞

Show inline comments

@@ @@ -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"

src/network/network_content_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/newgrf.cpp

➞

Show inline comments

@@ @@ -45,7 +45,7 @@ @@
 #include <map>
 #include "smallmap_gui.h"
 #include "genworld.h"
-#include "gui.h"
+#include "error.h"
 #include "vehicle_func.h"
 #include "language.h"
 #include "vehicle_base.h"

src/newgrf_commons.cpp

➞

Show inline comments

@@ @@ -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"

src/newgrf_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/newgrf_industries.cpp

➞

Show inline comments

@@ @@ -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"

src/openttd.cpp

➞

Show inline comments

@@ @@ -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"

src/saveload/saveload.cpp

➞

Show inline comments

@@ @@ -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"

src/screenshot.cpp

➞

Show inline comments

@@ @@ -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"

src/settings.cpp

➞

Show inline comments

@@ @@ -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"

src/settings_gui.cpp

➞

Show inline comments

@@ @@ -11,6 +11,7 @@ @@
 #include "stdafx.h"
 #include "currency.h"
 #include "error.h"
 #include "gui.h"
 #include "textbuf_gui.h"
 #include "command_func.h"

src/spriteloader/grf.cpp

➞

Show inline comments

@@ @@ -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"

src/strings.cpp

➞

Show inline comments

@@ @@ -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"

src/town_cmd.cpp

➞

Show inline comments

@@ @@ -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"

src/town_gui.cpp

➞

Show inline comments

@@ @@ -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"

src/train_cmd.cpp

➞

Show inline comments

@@ @@ -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"

src/vehicle.cpp

➞

Show inline comments

@@ @@ -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"

0 comments (0 inline, 0 general)