(svn r22019) -Codechange: s/functions.h/clear_func.h/

11 files changed, 22 insertions, 23 deletions

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 @@
     <ClInclude Include="..\src\cargotype.h" />
     <ClInclude Include="..\src\cheat_func.h" />
     <ClInclude Include="..\src\cheat_type.h" />
+    <ClInclude Include="..\src\clear_func.h" />
     <ClInclude Include="..\src\cmd_helper.h" />
     <ClInclude Include="..\src\command_func.h" />
     <ClInclude Include="..\src\command_type.h" />
@@ -429,7 +430,6 @@
     <ClInclude Include="..\src\fileio_type.h" />
     <ClInclude Include="..\src\fios.h" />
     <ClInclude Include="..\src\fontcache.h" />
-    <ClInclude Include="..\src\functions.h" />
     <ClInclude Include="..\src\gamelog.h" />
     <ClInclude Include="..\src\gamelog_internal.h" />
     <ClInclude Include="..\src\genworld.h" />
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 @@
     <ClInclude Include="..\src\cheat_type.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\src\clear_func.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="..\src\cmd_helper.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -507,9 +510,6 @@
     <ClInclude Include="..\src\fontcache.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\src\functions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="..\src\gamelog.h">
       <Filter>Header Files</Filter>
     </ClInclude>
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
@@ -827,6 +827,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\clear_func.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\cmd_helper.h"
 				>
 			</File>
@@ -991,10 +995,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\functions.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\gamelog.h"
 				>
 			</File>
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
@@ -824,6 +824,10 @@
 				>
 			</File>
 			<File
+				RelativePath=".\..\src\clear_func.h"
+				>
+			</File>
+			<File
 				RelativePath=".\..\src\cmd_helper.h"
 				>
 			</File>
@@ -988,10 +992,6 @@
 				>
 			</File>
 			<File
-				RelativePath=".\..\src\functions.h"
-				>
-			</File>
-			<File
 				RelativePath=".\..\src\gamelog.h"
 				>
 			</File>
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/functions.h b/src/clear_func.h
index 164ae3fe8..e85a5d1ae 100644
--- a/src/functions.h
+++ b/src/clear_func.h
@@ -7,17 +7,16 @@
  * 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 functions.h Some generic functions that actually shouldn't be here. */
+/** @file clear_func.h Functions related to clear (MP_CLEAR) land. */
 
-#ifndef FUNCTIONS_H
-#define FUNCTIONS_H
+#ifndef CLEAR_FUNC_H
+#define CLEAR_FUNC_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 */
+#endif /* CLEAR_FUNC_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"