gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-03-06 06:15:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r18343) -Fix [FS#3336] (r18243): dark blue signs would be drawn transparent

Browse Source
This commit is contained in:
rubidium 2009-11-29 19:27:53 +00:00
parent 2e2f72b971
commit ff5b46190d
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/viewport.cpp
View File

@ -57,7 +57,7 @@ ZoomLevel _saved_scrollpos_zoom;
struct StringSpriteToDraw { struct StringSpriteToDraw {
StringID string; StringID string;
uint16 colour; Colours colour;
int32 x; int32 x;
int32 y; int32 y;
uint64 params[2]; uint64 params[2];
@ -777,7 +777,7 @@ void AddChildSpriteScreen(SpriteID image, SpriteID pal, int x, int y, bool trans
} }
/* Returns a StringSpriteToDraw */ /* Returns a StringSpriteToDraw */
void AddStringToDraw(int x, int y, StringID string, uint64 params_1, uint64 params_2, uint16 colour, uint16 width) void AddStringToDraw(int x, int y, StringID string, uint64 params_1, uint64 params_2, Colours colour, uint16 width)
{ {
StringSpriteToDraw *ss = _vd.string_sprites_to_draw.Append(); StringSpriteToDraw *ss = _vd.string_sprites_to_draw.Append();
ss->string = string; ss->string = string;
@ -1073,7 +1073,7 @@ static void ViewportAddLandscape()
* @param string_small_shadow Shadow string for 4x and 8x zoom level; or STR_NULL if no shadow * @param string_small_shadow Shadow string for 4x and 8x zoom level; or STR_NULL if no shadow
* @param colour colour of the sign background; or 0 if transparent * @param colour colour of the sign background; or 0 if transparent
*/ */
static void ViewportAddString(const DrawPixelInfo *dpi, const ViewportSign *sign, StringID string_normal, StringID string_small, StringID string_small_shadow, uint64 params_1, uint64 params_2, uint16 colour = 0) static void ViewportAddString(const DrawPixelInfo *dpi, const ViewportSign *sign, StringID string_normal, StringID string_small, StringID string_small_shadow, uint64 params_1, uint64 params_2, Colours colour = INVALID_COLOUR)
{ {
int left = dpi->left; int left = dpi->left;
int top = dpi->top; int top = dpi->top;
@ -1092,7 +1092,7 @@ static void ViewportAddString(const DrawPixelInfo *dpi, const ViewportSign *sign
top < sign->top + ScaleByZoom(sign_height, dpi->zoom) && top < sign->top + ScaleByZoom(sign_height, dpi->zoom) &&
right > sign->left && right > sign->left &&
left < sign->left + ScaleByZoom(sign->width_normal, dpi->zoom)) { left < sign->left + ScaleByZoom(sign->width_normal, dpi->zoom)) {
AddStringToDraw(sign->left + 1, sign->top + 1, string_normal, params_1, params_2, colour, colour != 0 ? sign->width_normal : 0); AddStringToDraw(sign->left + 1, sign->top + 1, string_normal, params_1, params_2, colour, colour != INVALID_COLOUR ? sign->width_normal : 0);
} }
break; break;
@ -1111,7 +1111,7 @@ static void ViewportAddString(const DrawPixelInfo *dpi, const ViewportSign *sign
AddStringToDraw(sign->left + 1 + shadow_offset, sign->top + 1, string_small_shadow, params_1, params_2); AddStringToDraw(sign->left + 1 + shadow_offset, sign->top + 1, string_small_shadow, params_1, params_2);
} }
AddStringToDraw(sign->left + 1, sign->top + 1 - shadow_offset, string_small, params_1, params_2, AddStringToDraw(sign->left + 1, sign->top + 1 - shadow_offset, string_small, params_1, params_2,
colour, colour != 0 ? sign->width_small | 0x8000 : 0); colour, colour != INVALID_COLOUR ? sign->width_small | 0x8000 : 0);
} }
break; break;
@ -1148,7 +1148,7 @@ static void ViewportAddStationNames(DrawPixelInfo *dpi)
ViewportAddString(dpi, &st->sign, ViewportAddString(dpi, &st->sign,
is_station ? STR_VIEWPORT_STATION : STR_VIEWPORT_WAYPOINT, is_station ? STR_VIEWPORT_STATION : STR_VIEWPORT_WAYPOINT,
(is_station ? STR_VIEWPORT_STATION : STR_VIEWPORT_WAYPOINT) + 1, STR_NULL, (is_station ? STR_VIEWPORT_STATION : STR_VIEWPORT_WAYPOINT) + 1, STR_NULL,
st->index, st->facilities, (st->owner == OWNER_NONE || !st->IsInUse()) ? 0xE : _company_colours[st->owner]); st->index, st->facilities, (st->owner == OWNER_NONE || !st->IsInUse()) ? COLOUR_GREY : _company_colours[st->owner]);
} }
} }
@ -1163,7 +1163,7 @@ static void ViewportAddSigns(DrawPixelInfo *dpi)
ViewportAddString(dpi, &si->sign, ViewportAddString(dpi, &si->sign,
STR_WHITE_SIGN, STR_WHITE_SIGN,
IsTransparencySet(TO_SIGNS) ? STR_VIEWPORT_SIGN_SMALL_WHITE : STR_VIEWPORT_SIGN_SMALL_BLACK, STR_NULL, IsTransparencySet(TO_SIGNS) ? STR_VIEWPORT_SIGN_SMALL_WHITE : STR_VIEWPORT_SIGN_SMALL_BLACK, STR_NULL,
si->index, 0, (si->owner == OWNER_NONE) ? 14 : _company_colours[si->owner]); si->index, 0, (si->owner == OWNER_NONE) ? COLOUR_GREY : _company_colours[si->owner]);
} }
} }
@ -1357,7 +1357,7 @@ static void ViewportDrawStrings(DrawPixelInfo *dpi, const StringSpriteToDrawVect
* 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) { if (!IsTransparencySet(TO_SIGNS) || ss->string == STR_WHITE_SIGN) {
DrawFrameRect( DrawFrameRect(
x - 1, y - 1, x + 1 + w, bottom, (Colours)ss->colour, x - 1, y - 1, x + 1 + w, bottom, ss->colour,
IsTransparencySet(TO_SIGNS) ? FR_TRANSPARENT : FR_NONE IsTransparencySet(TO_SIGNS) ? FR_TRANSPARENT : FR_NONE
); );
} }

2
src/viewport_func.h
View File

@ -48,7 +48,7 @@ void OffsetGroundSprite(int x, int y);
void DrawGroundSprite(SpriteID image, SpriteID pal, const SubSprite *sub = NULL, int extra_offs_x = 0, int extra_offs_y = 0); void DrawGroundSprite(SpriteID image, SpriteID pal, const SubSprite *sub = NULL, int extra_offs_x = 0, int extra_offs_y = 0);
void DrawGroundSpriteAt(SpriteID image, SpriteID pal, int32 x, int32 y, byte z, const SubSprite *sub = NULL, int extra_offs_x = 0, int extra_offs_y = 0); void DrawGroundSpriteAt(SpriteID image, SpriteID pal, int32 x, int32 y, byte z, const SubSprite *sub = NULL, int extra_offs_x = 0, int extra_offs_y = 0);
void AddSortableSpriteToDraw(SpriteID image, SpriteID pal, int x, int y, int w, int h, int dz, int z, bool transparent = false, int bb_offset_x = 0, int bb_offset_y = 0, int bb_offset_z = 0, const SubSprite *sub = NULL); void AddSortableSpriteToDraw(SpriteID image, SpriteID pal, int x, int y, int w, int h, int dz, int z, bool transparent = false, int bb_offset_x = 0, int bb_offset_y = 0, int bb_offset_z = 0, const SubSprite *sub = NULL);
void AddStringToDraw(int x, int y, StringID string, uint64 params_1, uint64 params_2, uint16 colour = 0, uint16 width = 0); void AddStringToDraw(int x, int y, StringID string, uint64 params_1, uint64 params_2, Colours colour = INVALID_COLOUR, uint16 width = 0);
void AddChildSpriteScreen(SpriteID image, SpriteID pal, int x, int y, bool transparent = false, const SubSprite *sub = NULL); void AddChildSpriteScreen(SpriteID image, SpriteID pal, int x, int y, bool transparent = false, const SubSprite *sub = NULL);