From f35ed4bbc2b05f1b83476b60948d64375f77f1b4 Mon Sep 17 00:00:00 2001 From: rubidium Date: Wed, 10 Jan 2007 18:56:51 +0000 Subject: (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. --- src/water_cmd.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/water_cmd.cpp') diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index 10051e877..78787b20b 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -83,8 +83,8 @@ int32 CmdBuildShipDepot(TileIndex tile, uint32 flags, uint32 p1, uint32 p2) depot->xy = tile; depot->town_index = ClosestTownFromTile(tile, (uint)-1)->index; - MakeShipDepot(tile,_current_player, DEPOT_NORTH, p1); - MakeShipDepot(tile2,_current_player, DEPOT_SOUTH, p1); + MakeShipDepot(tile, _current_player, DEPOT_NORTH, (Axis)p1); + MakeShipDepot(tile2, _current_player, DEPOT_SOUTH, (Axis)p1); MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile2); } @@ -471,7 +471,7 @@ void DrawShipDepotSprite(int x, int y, int image) static uint GetSlopeZ_Water(TileIndex tile, uint x, uint y) { uint z; - uint tileh = GetTileSlope(tile, &z); + Slope tileh = GetTileSlope(tile, &z); return z + GetPartialZ(x & 0xF, y & 0xF, tileh); } @@ -672,7 +672,7 @@ static uint32 GetTileTrackStatus_Water(TileIndex tile, TransportType mode) switch (GetWaterTileType(tile)) { case WATER_CLEAR: ts = TRACK_BIT_ALL; break; - case WATER_COAST: ts = coast_tracks[GetTileSlope(tile, NULL) & 0xF]; break; + case WATER_COAST: ts = (TrackBits)coast_tracks[GetTileSlope(tile, NULL) & 0xF]; break; case WATER_LOCK: ts = AxisToTrackBits(DiagDirToAxis(GetLockDirection(tile))); break; case WATER_DEPOT: ts = AxisToTrackBits(GetShipDepotAxis(tile)); break; default: return 0; @@ -714,7 +714,7 @@ static uint32 VehicleEnter_Water(Vehicle *v, TileIndex tile, int x, int y) } -const TileTypeProcs _tile_type_water_procs = { +extern const TileTypeProcs _tile_type_water_procs = { DrawTile_Water, /* draw_tile_proc */ GetSlopeZ_Water, /* get_slope_z_proc */ ClearTile_Water, /* clear_tile_proc */ -- cgit v1.2.3-54-g00ecf