equal
deleted
inserted
replaced
785 if (m2 == 0) image |= PALETTE_TO_BARE_LAND; |
785 if (m2 == 0) image |= PALETTE_TO_BARE_LAND; |
786 if (m2 > 1) image += 4; |
786 if (m2 > 1) image += 4; |
787 } |
787 } |
788 |
788 |
789 DrawGroundSprite(image); |
789 DrawGroundSprite(image); |
790 if (GB(_m[ti->tile].m4, 0, 4) == RAILTYPE_ELECTRIC) DrawCatenary(ti); |
790 if (GetRailTypeCrossing(ti->tile) == RAILTYPE_ELECTRIC) DrawCatenary(ti); |
791 break; |
791 break; |
792 } |
792 } |
793 |
793 |
794 default: |
794 default: |
795 case ROAD_DEPOT: { |
795 case ROAD_DEPOT: { |
1012 case ROAD_NORMAL: |
1012 case ROAD_NORMAL: |
1013 return GB(_m[tile].m4, 4, 3) >= 6 ? |
1013 return GB(_m[tile].m4, 4, 3) >= 6 ? |
1014 0 : _road_trackbits[GetRoadBits(tile)] * 0x101; |
1014 0 : _road_trackbits[GetRoadBits(tile)] * 0x101; |
1015 |
1015 |
1016 case ROAD_CROSSING: { |
1016 case ROAD_CROSSING: { |
1017 uint32 r = (GetCrossingRoadAxis(tile) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y) * 0x101; |
1017 uint32 r = GetCrossingRailBits(tile) * 0x101; |
1018 |
1018 |
1019 if (_m[tile].m5 & 4) r *= 0x10001; |
1019 if (IsCrossingBarred(tile)) r *= 0x10001; |
1020 return r; |
1020 return r; |
1021 } |
1021 } |
1022 |
1022 |
1023 default: |
1023 default: |
1024 case ROAD_DEPOT: |
1024 case ROAD_DEPOT: |