summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-11-07 18:02:46 +0000
committerrubidium <rubidium@openttd.org>2008-11-07 18:02:46 +0000
commit27187e5a69dff6b66334283ed5c4ad21f7db59f4 (patch)
treec9c58785e56b560862505822c3e0c529b45b6956
parent0b3706a8d390e97c2d39f901977b414a5440d174 (diff)
downloadopenttd-27187e5a69dff6b66334283ed5c4ad21f7db59f4.tar.xz
(svn r14567) -Revert (part of 14566): don't commit testing stuff...
-rw-r--r--src/rail_cmd.cpp2
-rw-r--r--src/rail_map.h9
-rw-r--r--src/smallmap_gui.cpp16
3 files changed, 1 insertions, 26 deletions
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index fa8a63817..3b3621c46 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -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;
diff --git a/src/rail_map.h b/src/rail_map.h
index cf4e6e861..a6077cf0d 100644
--- a/src/rail_map.h
+++ b/src/rail_map.h
@@ -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)
{
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index 4eaf50926..5c993cc2c 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -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;
}