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

(svn r5396) - Remove two fixed parameters 

- Simplify an expresssion: c ? f(x) : f(y) -> f(c ? x : y)
release/0.5
tron 2006-06-28 06:10:20 +00:00
parent be0ec7bbf5
commit 2b7089c637
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pathfind.c
View File

@ -756,7 +756,7 @@ start_at:
/* Check the rail type only if the train is *NOT* on top of a bridge. */ /* Check the rail type only if the train is *NOT* on top of a bridge. */
if (!(IsBridgeTile(tile) && IsBridgeMiddle(tile) && GetBridgeAxis(tile) == DiagDirToAxis(direction))) { if (!(IsBridgeTile(tile) && IsBridgeMiddle(tile) && GetBridgeAxis(tile) == DiagDirToAxis(direction))) {
if (IsTileType(tile, MP_STREET) ? !HASBIT(tpf->railtypes, GetRailTypeCrossing(tile)) : !HASBIT(tpf->railtypes, GetRailType(tile))) { if (!HASBIT(tpf->railtypes, IsTileType(tile, MP_STREET) ? GetRailTypeCrossing(tile) : GetRailType(tile))) {
bits = 0; bits = 0;
break; break;
} }

12
rail_cmd.c
View File

@ -1205,7 +1205,7 @@ static void DrawSpecialBuilding(
* @param snow Draw as snow * @param snow Draw as snow
* @param flat Always draw foundation * @param flat Always draw foundation
*/ */
static void DrawTrackBits(TileInfo* ti, TrackBits track, bool flat) static void DrawTrackBits(TileInfo* ti, TrackBits track)
{ {
const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile)); const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(ti->tile));
PalSpriteID image; PalSpriteID image;
@ -1233,13 +1233,7 @@ static void DrawTrackBits(TileInfo* ti, TrackBits track, bool flat)
(image++, true); (image++, true);
if (ti->tileh != SLOPE_FLAT) { if (ti->tileh != SLOPE_FLAT) {
int foundation; uint foundation = GetRailFoundation(ti->tileh, track);
if (flat) {
foundation = ti->tileh;
} else {
foundation = GetRailFoundation(ti->tileh, track);
}
if (foundation != 0) DrawFoundation(ti, foundation); if (foundation != 0) DrawFoundation(ti, foundation);
@ -1313,7 +1307,7 @@ static void DrawTile_Track(TileInfo *ti)
if (GetRailTileType(ti->tile) != RAIL_TILE_DEPOT_WAYPOINT) { if (GetRailTileType(ti->tile) != RAIL_TILE_DEPOT_WAYPOINT) {
TrackBits rails = GetTrackBits(ti->tile); TrackBits rails = GetTrackBits(ti->tile);
DrawTrackBits(ti, rails, false); DrawTrackBits(ti, rails);
if (_display_opt & DO_FULL_DETAIL) DrawTrackDetails(ti); if (_display_opt & DO_FULL_DETAIL) DrawTrackDetails(ti);

5
road_cmd.c
View File

@ -696,8 +696,9 @@ const byte _road_sloped_sprites[14] = {
* @param ti TileInfo * @param ti TileInfo
* @param road RoadBits to draw * @param road RoadBits to draw
*/ */
static void DrawRoadBits(TileInfo* ti, RoadBits road) static void DrawRoadBits(TileInfo* ti)
{ {
RoadBits road = GetRoadBits(ti->tile);
const DrawRoadTileStruct *drts; const DrawRoadTileStruct *drts;
PalSpriteID image = 0; PalSpriteID image = 0;
Roadside roadside; Roadside roadside;
@ -752,7 +753,7 @@ static void DrawTile_Road(TileInfo *ti)
{ {
switch (GetRoadTileType(ti->tile)) { switch (GetRoadTileType(ti->tile)) {
case ROAD_TILE_NORMAL: case ROAD_TILE_NORMAL:
DrawRoadBits(ti, GetRoadBits(ti->tile)); DrawRoadBits(ti);
break; break;
case ROAD_TILE_CROSSING: { case ROAD_TILE_CROSSING: {