(svn r14567) -Revert (part of 14566): don't commit testing stuff...

pull/155/head
rubidium 16 years ago
parent 0b3706a8d3
commit 27187e5a69

@ -2108,8 +2108,6 @@ static void TileLoop_Track(TileIndex tile)
RailGroundType old_ground = GetRailGroundType(tile);
RailGroundType new_ground;
UpdateStat(tile, !EnsureNoVehicleOnGround(tile));
if (old_ground == RAIL_GROUND_WATER) {
TileLoop_Water(tile);
return;

@ -598,15 +598,6 @@ static inline bool IsSnowRailGround(TileIndex t)
return GetRailGroundType(t) == RAIL_GROUND_ICE_DESERT;
}
static inline void UpdateStat(TileIndex t, bool on_track)
{
_me[t].m7 = _me[t].m7 << 1 | !!on_track;
}
static inline byte GetStat(TileIndex t)
{
return _me[t].m7;
}
static inline void MakeRailNormal(TileIndex t, Owner o, TrackBits b, RailType r)
{

@ -383,20 +383,6 @@ static inline uint32 GetSmallMapIndustriesPixels(TileIndex tile)
return ApplyMask(MKCOLOR(0x54545454), &_smallmap_vehicles_andor[t]);
}
#define MK(x) MKCOLOR(x << 24 | x << 16 | x << 8 | x)
static const uint32 _busyness[] = {
MK(15),
MK(150),
MK(209),
MK(206),
MK(191),
MK(186),
MK(184),
MK(180),
};
/**
* Return the color a tile would be displayed with in the small map in mode "Routes".
*
@ -419,7 +405,7 @@ static inline uint32 GetSmallMapRoutesPixels(TileIndex tile)
}
} else {
/* ground color */
bits = ApplyMask(t == MP_RAILWAY ? _busyness[CountBits(GetStat(tile))] : MKCOLOR(0x54545454), &_smallmap_contours_andor[t]);
bits = ApplyMask(MKCOLOR(0x54545454), &_smallmap_contours_andor[t]);
}
return bits;
}

Loading…
Cancel
Save