diff --git a/projects/openttd_vs100.vcxproj b/projects/openttd_vs100.vcxproj
index a3b6f94617..53c8d45473 100644
--- a/projects/openttd_vs100.vcxproj
+++ b/projects/openttd_vs100.vcxproj
@@ -685,7 +685,6 @@
-
@@ -704,6 +703,7 @@
+
diff --git a/projects/openttd_vs100.vcxproj.filters b/projects/openttd_vs100.vcxproj.filters
index 9cf90ea0be..0d9c996904 100644
--- a/projects/openttd_vs100.vcxproj.filters
+++ b/projects/openttd_vs100.vcxproj.filters
@@ -1258,9 +1258,6 @@
Command handlers
-
- Command handlers
-
Command handlers
@@ -1315,6 +1312,9 @@
Command handlers
+
+ Command handlers
+
Command handlers
diff --git a/projects/openttd_vs80.vcproj b/projects/openttd_vs80.vcproj
index f0bf20bc99..caad61a7c0 100644
--- a/projects/openttd_vs80.vcproj
+++ b/projects/openttd_vs80.vcproj
@@ -2023,10 +2023,6 @@
RelativePath=".\..\src\disaster_cmd.cpp"
>
-
-
@@ -2099,6 +2095,10 @@
RelativePath=".\..\src\vehicle_cmd.cpp"
>
+
+
diff --git a/projects/openttd_vs90.vcproj b/projects/openttd_vs90.vcproj
index c232620115..1d35bb7f95 100644
--- a/projects/openttd_vs90.vcproj
+++ b/projects/openttd_vs90.vcproj
@@ -2020,10 +2020,6 @@
RelativePath=".\..\src\disaster_cmd.cpp"
>
-
-
@@ -2096,6 +2092,10 @@
RelativePath=".\..\src\vehicle_cmd.cpp"
>
+
+
diff --git a/source.list b/source.list
index d0c34c42c1..3505807aea 100644
--- a/source.list
+++ b/source.list
@@ -434,7 +434,6 @@ clear_cmd.cpp
company_cmd.cpp
depot_cmd.cpp
disaster_cmd.cpp
-dummy_land.cpp
group_cmd.cpp
industry_cmd.cpp
misc_cmd.cpp
@@ -453,6 +452,7 @@ train_cmd.cpp
tree_cmd.cpp
tunnelbridge_cmd.cpp
vehicle_cmd.cpp
+void_cmd.cpp
water_cmd.cpp
waypoint_cmd.cpp
diff --git a/src/landscape.cpp b/src/landscape.cpp
index f8dcd58415..4804ea2156 100644
--- a/src/landscape.cpp
+++ b/src/landscape.cpp
@@ -40,7 +40,7 @@ extern const TileTypeProcs
_tile_type_trees_procs,
_tile_type_station_procs,
_tile_type_water_procs,
- _tile_type_dummy_procs,
+ _tile_type_void_procs,
_tile_type_industry_procs,
_tile_type_tunnelbridge_procs,
_tile_type_object_procs;
@@ -58,7 +58,7 @@ const TileTypeProcs * const _tile_type_procs[16] = {
&_tile_type_trees_procs, ///< Callback functions for MP_TREES tiles
&_tile_type_station_procs, ///< Callback functions for MP_STATION tiles
&_tile_type_water_procs, ///< Callback functions for MP_WATER tiles
- &_tile_type_dummy_procs, ///< Callback functions for MP_VOID tiles
+ &_tile_type_void_procs, ///< Callback functions for MP_VOID tiles
&_tile_type_industry_procs, ///< Callback functions for MP_INDUSTRY tiles
&_tile_type_tunnelbridge_procs, ///< Callback functions for MP_TUNNELBRIDGE tiles
&_tile_type_object_procs, ///< Callback functions for MP_OBJECT tiles
diff --git a/src/dummy_land.cpp b/src/void_cmd.cpp
similarity index 52%
rename from src/dummy_land.cpp
rename to src/void_cmd.cpp
index 0490fc2931..e80f961c14 100644
--- a/src/dummy_land.cpp
+++ b/src/void_cmd.cpp
@@ -7,7 +7,7 @@
* 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 dummy_land.cpp Handling of void (or dummy) tiles. */
+/** @file void_cmd.cpp Handling of void tiles. */
#include "stdafx.h"
#include "tile_cmd.h"
@@ -17,67 +17,67 @@
#include "table/strings.h"
#include "table/sprites.h"
-static void DrawTile_Dummy(TileInfo *ti)
+static void DrawTile_Void(TileInfo *ti)
{
DrawGroundSprite(SPR_SHADOW_CELL, PAL_NONE);
}
-static uint GetSlopeZ_Dummy(TileIndex tile, uint x, uint y)
+static uint GetSlopeZ_Void(TileIndex tile, uint x, uint y)
{
return TilePixelHeight(tile);
}
-static Foundation GetFoundation_Dummy(TileIndex tile, Slope tileh)
+static Foundation GetFoundation_Void(TileIndex tile, Slope tileh)
{
return FOUNDATION_NONE;
}
-static CommandCost ClearTile_Dummy(TileIndex tile, DoCommandFlag flags)
+static CommandCost ClearTile_Void(TileIndex tile, DoCommandFlag flags)
{
return_cmd_error(STR_ERROR_OFF_EDGE_OF_MAP);
}
-static void GetTileDesc_Dummy(TileIndex tile, TileDesc *td)
+static void GetTileDesc_Void(TileIndex tile, TileDesc *td)
{
td->str = STR_EMPTY;
td->owner[0] = OWNER_NONE;
}
-static void TileLoop_Dummy(TileIndex tile)
+static void TileLoop_Void(TileIndex tile)
{
/* not used */
}
-static void ChangeTileOwner_Dummy(TileIndex tile, Owner old_owner, Owner new_owner)
+static void ChangeTileOwner_Void(TileIndex tile, Owner old_owner, Owner new_owner)
{
/* not used */
}
-static TrackStatus GetTileTrackStatus_Dummy(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side)
+static TrackStatus GetTileTrackStatus_Void(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side)
{
return 0;
}
-static CommandCost TerraformTile_Dummy(TileIndex tile, DoCommandFlag flags, uint z_new, Slope tileh_new)
+static CommandCost TerraformTile_Void(TileIndex tile, DoCommandFlag flags, uint z_new, Slope tileh_new)
{
return_cmd_error(STR_ERROR_OFF_EDGE_OF_MAP);
}
-extern const TileTypeProcs _tile_type_dummy_procs = {
- DrawTile_Dummy, // draw_tile_proc
- GetSlopeZ_Dummy, // get_slope_z_proc
- ClearTile_Dummy, // clear_tile_proc
+extern const TileTypeProcs _tile_type_void_procs = {
+ DrawTile_Void, // draw_tile_proc
+ GetSlopeZ_Void, // get_slope_z_proc
+ ClearTile_Void, // clear_tile_proc
NULL, // add_accepted_cargo_proc
- GetTileDesc_Dummy, // get_tile_desc_proc
- GetTileTrackStatus_Dummy, // get_tile_track_status_proc
+ GetTileDesc_Void, // get_tile_desc_proc
+ GetTileTrackStatus_Void, // get_tile_track_status_proc
NULL, // click_tile_proc
NULL, // animate_tile_proc
- TileLoop_Dummy, // tile_loop_clear
- ChangeTileOwner_Dummy, // change_tile_owner_clear
+ TileLoop_Void, // tile_loop_clear
+ ChangeTileOwner_Void, // change_tile_owner_clear
NULL, // add_produced_cargo_proc
NULL, // vehicle_enter_tile_proc
- GetFoundation_Dummy, // get_foundation_proc
- TerraformTile_Dummy, // terraform_tile_proc
+ GetFoundation_Void, // get_foundation_proc
+ TerraformTile_Void, // terraform_tile_proc
};