(svn r14566) -Fix [FS#2397]: RV's go via order would reserve a slot at the 'via' station which it never uses, which makes it unlikely that it reserves a slot for the next station and that makes queueing fail (Aali)

This commit is contained in:
rubidium
2008-11-07 17:59:51 +00:00
parent e91ae97e19
commit c7f3935506
4 changed files with 27 additions and 2 deletions

View File

@@ -383,6 +383,20 @@ 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".
*
@@ -405,7 +419,7 @@ static inline uint32 GetSmallMapRoutesPixels(TileIndex tile)
}
} else {
/* ground color */
bits = ApplyMask(MKCOLOR(0x54545454), &_smallmap_contours_andor[t]);
bits = ApplyMask(t == MP_RAILWAY ? _busyness[CountBits(GetStat(tile))] : MKCOLOR(0x54545454), &_smallmap_contours_andor[t]);
}
return bits;
}