mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r20419) -Codechange: Rename dummy_land.cpp to void_cmd.cpp

release/1.1
frosch 2010-08-09 06:48:52 +00:00
parent a56f8ba801
commit 67c21f7e01
7 changed files with 35 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/openttd_vs100.vcxproj
View File

@ -685,7 +685,6 @@
<ClCompile Include="..\src\company_cmd.cpp" /> <ClCompile Include="..\src\company_cmd.cpp" />
<ClCompile Include="..\src\depot_cmd.cpp" /> <ClCompile Include="..\src\depot_cmd.cpp" />
<ClCompile Include="..\src\disaster_cmd.cpp" /> <ClCompile Include="..\src\disaster_cmd.cpp" />
<ClCompile Include="..\src\dummy_land.cpp" />
<ClCompile Include="..\src\group_cmd.cpp" /> <ClCompile Include="..\src\group_cmd.cpp" />
<ClCompile Include="..\src\industry_cmd.cpp" /> <ClCompile Include="..\src\industry_cmd.cpp" />
<ClCompile Include="..\src\misc_cmd.cpp" /> <ClCompile Include="..\src\misc_cmd.cpp" />
@ -704,6 +703,7 @@
<ClCompile Include="..\src\tree_cmd.cpp" /> <ClCompile Include="..\src\tree_cmd.cpp" />
<ClCompile Include="..\src\tunnelbridge_cmd.cpp" /> <ClCompile Include="..\src\tunnelbridge_cmd.cpp" />
<ClCompile Include="..\src\vehicle_cmd.cpp" /> <ClCompile Include="..\src\vehicle_cmd.cpp" />
<ClCompile Include="..\src\void_cmd.cpp" />
<ClCompile Include="..\src\water_cmd.cpp" /> <ClCompile Include="..\src\water_cmd.cpp" />
<ClCompile Include="..\src\waypoint_cmd.cpp" /> <ClCompile Include="..\src\waypoint_cmd.cpp" />
<ClCompile Include="..\src\saveload\afterload.cpp" /> <ClCompile Include="..\src\saveload\afterload.cpp" />

6
projects/openttd_vs100.vcxproj.filters
View File

@ -1258,9 +1258,6 @@
<ClCompile Include="..\src\disaster_cmd.cpp"> <ClCompile Include="..\src\disaster_cmd.cpp">
<Filter>Command handlers</Filter> <Filter>Command handlers</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\dummy_land.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\group_cmd.cpp"> <ClCompile Include="..\src\group_cmd.cpp">
<Filter>Command handlers</Filter> <Filter>Command handlers</Filter>
</ClCompile> </ClCompile>
@ -1315,6 +1312,9 @@
<ClCompile Include="..\src\vehicle_cmd.cpp"> <ClCompile Include="..\src\vehicle_cmd.cpp">
<Filter>Command handlers</Filter> <Filter>Command handlers</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\src\void_cmd.cpp">
<Filter>Command handlers</Filter>
</ClCompile>
<ClCompile Include="..\src\water_cmd.cpp"> <ClCompile Include="..\src\water_cmd.cpp">
<Filter>Command handlers</Filter> <Filter>Command handlers</Filter>
</ClCompile> </ClCompile>

8
projects/openttd_vs80.vcproj
View File

@ -2023,10 +2023,6 @@
RelativePath=".\..\src\disaster_cmd.cpp" RelativePath=".\..\src\disaster_cmd.cpp"
> >
</File> </File>
<File
RelativePath=".\..\src\dummy_land.cpp"
>
</File>
<File <File
RelativePath=".\..\src\group_cmd.cpp" RelativePath=".\..\src\group_cmd.cpp"
> >
@ -2099,6 +2095,10 @@
RelativePath=".\..\src\vehicle_cmd.cpp" RelativePath=".\..\src\vehicle_cmd.cpp"
> >
</File> </File>
<File
RelativePath=".\..\src\void_cmd.cpp"
>
</File>
<File <File
RelativePath=".\..\src\water_cmd.cpp" RelativePath=".\..\src\water_cmd.cpp"
> >

8
projects/openttd_vs90.vcproj
View File

@ -2020,10 +2020,6 @@
RelativePath=".\..\src\disaster_cmd.cpp" RelativePath=".\..\src\disaster_cmd.cpp"
> >
</File> </File>
<File
RelativePath=".\..\src\dummy_land.cpp"
>
</File>
<File <File
RelativePath=".\..\src\group_cmd.cpp" RelativePath=".\..\src\group_cmd.cpp"
> >
@ -2096,6 +2092,10 @@
RelativePath=".\..\src\vehicle_cmd.cpp" RelativePath=".\..\src\vehicle_cmd.cpp"
> >
</File> </File>
<File
RelativePath=".\..\src\void_cmd.cpp"
>
</File>
<File <File
RelativePath=".\..\src\water_cmd.cpp" RelativePath=".\..\src\water_cmd.cpp"
> >

2
source.list
View File

@ -434,7 +434,6 @@ clear_cmd.cpp
company_cmd.cpp company_cmd.cpp
depot_cmd.cpp depot_cmd.cpp
disaster_cmd.cpp disaster_cmd.cpp
dummy_land.cpp
group_cmd.cpp group_cmd.cpp
industry_cmd.cpp industry_cmd.cpp
misc_cmd.cpp misc_cmd.cpp
@ -453,6 +452,7 @@ train_cmd.cpp
tree_cmd.cpp tree_cmd.cpp
tunnelbridge_cmd.cpp tunnelbridge_cmd.cpp
vehicle_cmd.cpp vehicle_cmd.cpp
void_cmd.cpp
water_cmd.cpp water_cmd.cpp
waypoint_cmd.cpp waypoint_cmd.cpp

4
src/landscape.cpp
View File

@ -40,7 +40,7 @@ extern const TileTypeProcs
_tile_type_trees_procs, _tile_type_trees_procs,
_tile_type_station_procs, _tile_type_station_procs,
_tile_type_water_procs, _tile_type_water_procs,
_tile_type_dummy_procs, _tile_type_void_procs,
_tile_type_industry_procs, _tile_type_industry_procs,
_tile_type_tunnelbridge_procs, _tile_type_tunnelbridge_procs,
_tile_type_object_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_trees_procs, ///< Callback functions for MP_TREES tiles
&_tile_type_station_procs, ///< Callback functions for MP_STATION tiles &_tile_type_station_procs, ///< Callback functions for MP_STATION tiles
&_tile_type_water_procs, ///< Callback functions for MP_WATER 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_industry_procs, ///< Callback functions for MP_INDUSTRY tiles
&_tile_type_tunnelbridge_procs, ///< Callback functions for MP_TUNNELBRIDGE tiles &_tile_type_tunnelbridge_procs, ///< Callback functions for MP_TUNNELBRIDGE tiles
&_tile_type_object_procs, ///< Callback functions for MP_OBJECT tiles &_tile_type_object_procs, ///< Callback functions for MP_OBJECT tiles

40
src/dummy_land.cpp → src/void_cmd.cpp
View File

@ -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 <http://www.gnu.org/licenses/>. * 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 dummy_land.cpp Handling of void (or dummy) tiles. */ /** @file void_cmd.cpp Handling of void tiles. */
#include "stdafx.h" #include "stdafx.h"
#include "tile_cmd.h" #include "tile_cmd.h"
@ -17,67 +17,67 @@
#include "table/strings.h" #include "table/strings.h"
#include "table/sprites.h" #include "table/sprites.h"
static void DrawTile_Dummy(TileInfo *ti) static void DrawTile_Void(TileInfo *ti)
{ {
DrawGroundSprite(SPR_SHADOW_CELL, PAL_NONE); 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); return TilePixelHeight(tile);
} }
static Foundation GetFoundation_Dummy(TileIndex tile, Slope tileh) static Foundation GetFoundation_Void(TileIndex tile, Slope tileh)
{ {
return FOUNDATION_NONE; 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); 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->str = STR_EMPTY;
td->owner[0] = OWNER_NONE; td->owner[0] = OWNER_NONE;
} }
static void TileLoop_Dummy(TileIndex tile) static void TileLoop_Void(TileIndex tile)
{ {
/* not used */ /* 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 */ /* 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; 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); return_cmd_error(STR_ERROR_OFF_EDGE_OF_MAP);
} }
extern const TileTypeProcs _tile_type_dummy_procs = { extern const TileTypeProcs _tile_type_void_procs = {
DrawTile_Dummy, // draw_tile_proc DrawTile_Void, // draw_tile_proc
GetSlopeZ_Dummy, // get_slope_z_proc GetSlopeZ_Void, // get_slope_z_proc
ClearTile_Dummy, // clear_tile_proc ClearTile_Void, // clear_tile_proc
NULL, // add_accepted_cargo_proc NULL, // add_accepted_cargo_proc
GetTileDesc_Dummy, // get_tile_desc_proc GetTileDesc_Void, // get_tile_desc_proc
GetTileTrackStatus_Dummy, // get_tile_track_status_proc GetTileTrackStatus_Void, // get_tile_track_status_proc
NULL, // click_tile_proc NULL, // click_tile_proc
NULL, // animate_tile_proc NULL, // animate_tile_proc
TileLoop_Dummy, // tile_loop_clear TileLoop_Void, // tile_loop_clear
ChangeTileOwner_Dummy, // change_tile_owner_clear ChangeTileOwner_Void, // change_tile_owner_clear
NULL, // add_produced_cargo_proc NULL, // add_produced_cargo_proc
NULL, // vehicle_enter_tile_proc NULL, // vehicle_enter_tile_proc
GetFoundation_Dummy, // get_foundation_proc GetFoundation_Void, // get_foundation_proc
TerraformTile_Dummy, // terraform_tile_proc TerraformTile_Void, // terraform_tile_proc
}; };