From 0395aab420756b9e0a271011c754d4c70cc0c06f Mon Sep 17 00:00:00 2001 From: rubidium Date: Mon, 7 Feb 2011 22:38:02 +0000 Subject: (svn r22019) -Codechange: s/functions.h/clear_func.h/ --- projects/openttd_vs100.vcxproj | 2 +- projects/openttd_vs100.vcxproj.filters | 6 +++--- projects/openttd_vs80.vcproj | 8 ++++---- projects/openttd_vs90.vcproj | 8 ++++---- source.list | 2 +- src/clear_cmd.cpp | 2 +- src/clear_func.h | 22 ++++++++++++++++++++++ src/functions.h | 23 ----------------------- src/object_cmd.cpp | 2 +- src/station_cmd.cpp | 2 +- src/tree_cmd.cpp | 2 +- src/tunnelbridge_cmd.cpp | 2 +- 12 files changed, 40 insertions(+), 41 deletions(-) create mode 100644 src/clear_func.h delete mode 100644 src/functions.h diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj index 69360a650..edfda1945 100644 --- a/projects/openttd_vs100.vcxproj +++ b/projects/openttd_vs100.vcxproj @@ -388,6 +388,7 @@ + @@ -429,7 +430,6 @@ - diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters index fd904c1da..5e009c208 100644 --- a/projects/openttd_vs100.vcxproj.filters +++ b/projects/openttd_vs100.vcxproj.filters @@ -384,6 +384,9 @@ Header Files + + Header Files + Header Files @@ -507,9 +510,6 @@ Header Files - - Header Files - Header Files diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj index 92813dee4..8b531142a 100644 --- a/projects/openttd_vs80.vcproj +++ b/projects/openttd_vs80.vcproj @@ -826,6 +826,10 @@ RelativePath=".\..\src\cheat_type.h" > + + @@ -990,10 +994,6 @@ RelativePath=".\..\src\fontcache.h" > - - diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj index f04386b15..4df272e64 100644 --- a/projects/openttd_vs90.vcproj +++ b/projects/openttd_vs90.vcproj @@ -823,6 +823,10 @@ RelativePath=".\..\src\cheat_type.h" > + + @@ -987,10 +991,6 @@ RelativePath=".\..\src\fontcache.h" > - - diff --git a/source.list b/source.list index efcf33830..3370af3cf 100644 --- a/source.list +++ b/source.list @@ -121,6 +121,7 @@ cargopacket.h cargotype.h cheat_func.h cheat_type.h +clear_func.h cmd_helper.h command_func.h command_type.h @@ -162,7 +163,6 @@ fileio_func.h fileio_type.h fios.h fontcache.h -functions.h gamelog.h gamelog_internal.h genworld.h diff --git a/src/clear_cmd.cpp b/src/clear_cmd.cpp index 42226a845..5106113d3 100644 --- a/src/clear_cmd.cpp +++ b/src/clear_cmd.cpp @@ -15,7 +15,7 @@ #include "landscape.h" #include "genworld.h" #include "landscape_type.h" -#include "functions.h" +#include "clear_func.h" #include "economy_func.h" #include "viewport_func.h" #include "water.h" diff --git a/src/clear_func.h b/src/clear_func.h new file mode 100644 index 000000000..e85a5d1ae --- /dev/null +++ b/src/clear_func.h @@ -0,0 +1,22 @@ +/* $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 clear_func.h Functions related to clear (MP_CLEAR) land. */ + +#ifndef CLEAR_FUNC_H +#define CLEAR_FUNC_H + +#include "tile_cmd.h" + +void DrawHillyLandTile(const TileInfo *ti); +void DrawClearLandTile(const TileInfo *ti, byte set); +void DrawClearLandFence(const TileInfo *ti); +void TileLoopClearHelper(TileIndex tile); + +#endif /* CLEAR_FUNC_H */ diff --git a/src/functions.h b/src/functions.h deleted file mode 100644 index 164ae3fe8..000000000 --- a/src/functions.h +++ /dev/null @@ -1,23 +0,0 @@ -/* $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 functions.h Some generic functions that actually shouldn't be here. */ - -#ifndef FUNCTIONS_H -#define FUNCTIONS_H - -#include "tile_cmd.h" - -/* clear_land.cpp */ -void DrawHillyLandTile(const TileInfo *ti); -void DrawClearLandTile(const TileInfo *ti, byte set); -void DrawClearLandFence(const TileInfo *ti); -void TileLoopClearHelper(TileIndex tile); - -#endif /* FUNCTIONS_H */ diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp index e6c19a60f..29163cab3 100644 --- a/src/object_cmd.cpp +++ b/src/object_cmd.cpp @@ -18,7 +18,7 @@ #include "bridge_map.h" #include "genworld.h" #include "autoslope.h" -#include "functions.h" +#include "clear_func.h" #include "water.h" #include "window_func.h" #include "company_gui.h" diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp index 6f7e6450a..d584b3131 100644 --- a/src/station_cmd.cpp +++ b/src/station_cmd.cpp @@ -29,7 +29,7 @@ #include "water.h" #include "station_gui.h" #include "strings_func.h" -#include "functions.h" +#include "clear_func.h" #include "window_func.h" #include "date_func.h" #include "vehicle_func.h" diff --git a/src/tree_cmd.cpp b/src/tree_cmd.cpp index 59bebc659..ea1656a00 100644 --- a/src/tree_cmd.cpp +++ b/src/tree_cmd.cpp @@ -19,7 +19,7 @@ #include "town.h" #include "genworld.h" #include "transparency.h" -#include "functions.h" +#include "clear_func.h" #include "company_func.h" #include "sound_func.h" #include "water_map.h" diff --git a/src/tunnelbridge_cmd.cpp b/src/tunnelbridge_cmd.cpp index e27d62e17..0f09b7bcc 100644 --- a/src/tunnelbridge_cmd.cpp +++ b/src/tunnelbridge_cmd.cpp @@ -29,7 +29,7 @@ #include "tunnelbridge_map.h" #include "strings_func.h" #include "date_func.h" -#include "functions.h" +#include "clear_func.h" #include "vehicle_func.h" #include "sound_func.h" #include "tunnelbridge.h" -- cgit v1.2.3-70-g09d2