Loading

Paste #p4ertvphe

  1. diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
  2. index 6075fb1fd..d45ffabb8 100644
  3. --- a/src/road_cmd.cpp
  4. +++ b/src/road_cmd.cpp
  5. @@ -1397,6 +1397,8 @@ static bool DrawRoadAsSnowDesert(TileIndex tile, Roadside roadside)
  6.   */
  7.  void DrawRoadTypeCatenary(const TileInfo *ti, RoadTypeIdentifier rtid, RoadBits rb)
  8.  {
  9. +    PaletteID pal = COMPANY_SPRITE_COLOUR(GetRoadOwner(ti->tile, rtid.basetype));
  10. +
  11.     /* Don't draw the catenary under a low bridge */
  12.     if (IsBridgeAbove(ti->tile) && !IsTransparencySet(TO_CATENARY)) {
  13.         int height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
  14. @@ -1438,8 +1440,8 @@ void DrawRoadTypeCatenary(const TileInfo *ti, RoadTypeIdentifier rtid, RoadBits
  15.         front = SPR_TRAMWAY_BASE + _road_frontwire_sprites_1[rb];
  16.     }
  17.  
  18. -   if (back != 0) AddSortableSpriteToDraw(back,  PAL_NONE, ti->x, ti->y, 16, 16, TILE_HEIGHT + BB_HEIGHT_UNDER_BRIDGE, ti->z, IsTransparencySet(TO_CATENARY));
  19. -   if (front != 0) AddSortableSpriteToDraw(front, PAL_NONE, ti->x, ti->y, 16, 16, TILE_HEIGHT + BB_HEIGHT_UNDER_BRIDGE, ti->z, IsTransparencySet(TO_CATENARY));
  20. +   if (back != 0) AddSortableSpriteToDraw(back,  pal, ti->x, ti->y, 16, 16, TILE_HEIGHT + BB_HEIGHT_UNDER_BRIDGE, ti->z, IsTransparencySet(TO_CATENARY));
  21. +   if (front != 0) AddSortableSpriteToDraw(front, pal, ti->x, ti->y, 16, 16, TILE_HEIGHT + BB_HEIGHT_UNDER_BRIDGE, ti->z, IsTransparencySet(TO_CATENARY));
  22.  }
  23.  
  24.  /**
  25. @@ -1690,7 +1692,7 @@ static void DrawTile_Road(TileInfo *ti)
  26.                     if (ground != 0) DrawGroundSprite(ground + axis, PAL_NONE);
  27.                 }
  28.             }
  29. -  
  30. +
  31.             /* Draw tram overlay */
  32.             if (tram_rti != NULL) {
  33.                 if (tram_rti->UsesOverlay()) {

Comments