mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-03-12 10:30:28 +00:00
(svn r25823) -Codechange [FS#5780]: Simplify if-cases in ViewportDrawStrings. (Juanjo)
This commit is contained in:
parent
b4609fd923
commit
3d99546107
@ -1423,17 +1423,14 @@ static void ViewportDrawStrings(ZoomLevel zoom, const StringSpriteToDrawVector *
|
|||||||
/* Do not draw signs nor station names if they are set invisible */
|
/* Do not draw signs nor station names if they are set invisible */
|
||||||
if (IsInvisibilitySet(TO_SIGNS) && ss->string != STR_WHITE_SIGN) continue;
|
if (IsInvisibilitySet(TO_SIGNS) && ss->string != STR_WHITE_SIGN) continue;
|
||||||
|
|
||||||
/* if we didn't draw a rectangle, or if transperant building is on,
|
|
||||||
* draw the text in the colour the rectangle would have */
|
|
||||||
if (IsTransparencySet(TO_SIGNS) && ss->string != STR_WHITE_SIGN) {
|
if (IsTransparencySet(TO_SIGNS) && ss->string != STR_WHITE_SIGN) {
|
||||||
/* Real colours need the TC_IS_PALETTE_COLOUR flag
|
/* Don't draw the rectangle.
|
||||||
* otherwise colours from _string_colourmap are assumed. */
|
* Real colours need the TC_IS_PALETTE_COLOUR flag.
|
||||||
|
* Otherwise colours from _string_colourmap are assumed. */
|
||||||
colour = (TextColour)_colour_gradient[ss->colour][6] | TC_IS_PALETTE_COLOUR;
|
colour = (TextColour)_colour_gradient[ss->colour][6] | TC_IS_PALETTE_COLOUR;
|
||||||
}
|
} else {
|
||||||
|
/* Draw the rectangle if 'transparent station signs' is off,
|
||||||
/* Draw the rectangle if 'transparent station signs' is off,
|
* or if we are drawing a general text sign (STR_WHITE_SIGN). */
|
||||||
* or if we are drawing a general text sign (STR_WHITE_SIGN) */
|
|
||||||
if (!IsTransparencySet(TO_SIGNS) || ss->string == STR_WHITE_SIGN) {
|
|
||||||
DrawFrameRect(
|
DrawFrameRect(
|
||||||
x, y, x + w, y + h, ss->colour,
|
x, y, x + w, y + h, ss->colour,
|
||||||
IsTransparencySet(TO_SIGNS) ? FR_TRANSPARENT : FR_NONE
|
IsTransparencySet(TO_SIGNS) ? FR_TRANSPARENT : FR_NONE
|
||||||
|
Loading…
Reference in New Issue
Block a user