diff options
| author | rubidium <rubidium@openttd.org> | 2007-05-20 22:04:24 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2007-05-20 22:04:24 +0000 |
| commit | 07535d857b8010f365b13b2a63f7263638cf8641 (patch) | |
| tree | ac57754a35ba01ad4ff91419f6ce4e25bad6e86c /src/road_map.h | |
| parent | d86b5e5e9328e85faa1bf97615b8c796fc874863 (diff) | |
| download | openttd-07535d857b8010f365b13b2a63f7263638cf8641.tar.xz | |
(svn r9893) -Fix (r9892): various small bugs that only act up when using something different than plain roads.
Diffstat (limited to 'src/road_map.h')
| -rw-r--r-- | src/road_map.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/road_map.h b/src/road_map.h index 15edb8e43..4887e76d3 100644 --- a/src/road_map.h +++ b/src/road_map.h @@ -116,6 +116,7 @@ static inline void SetRoadOwner(TileIndex t, RoadType rt, Owner o) case ROADTYPE_TRAM: SB( _m[t].m5, 0, 5, o); break; case ROADTYPE_HWAY: SB(_me[t].m7, 0, 5, o); break; } + break; case ROAD_TILE_CROSSING: switch (rt) { default: NOT_REACHED(); @@ -123,6 +124,7 @@ static inline void SetRoadOwner(TileIndex t, RoadType rt, Owner o) case ROADTYPE_TRAM: SB( _m[t].m5, 0, 5, o); break; case ROADTYPE_HWAY: SB(_me[t].m7, 0, 5, o); break; } + break; case ROAD_TILE_DEPOT: return SetTileOwner(t, o); } } @@ -264,7 +266,7 @@ static inline void MakeRoadNormal(TileIndex t, RoadBits bits, RoadTypes rot, Tow SetTileOwner(t, road); _m[t].m2 = town; _m[t].m3 = 0; - _m[t].m4 = (HASBIT(rot, ROADTYPE_ROAD) ? bits : 0) << 4 | HASBIT(rot, ROADTYPE_TRAM) ? bits : 0; + _m[t].m4 = (HASBIT(rot, ROADTYPE_TRAM) ? bits : 0) << 4 | (HASBIT(rot, ROADTYPE_ROAD) ? bits : 0); _m[t].m5 = ROAD_TILE_NORMAL << 6 | tram; SB(_m[t].m6, 2, 4, HASBIT(rot, ROADTYPE_HWAY) ? bits : 0); _me[t].m7 = rot << 5 | hway; |