diff options
| -rw-r--r-- | src/blitter/32bpp_anim.cpp | 2 | ||||
| -rw-r--r-- | src/blitter/32bpp_simple.cpp | 2 | ||||
| -rw-r--r-- | src/news_gui.cpp | 4 | ||||
| -rw-r--r-- | src/table/sprites.h | 4 | ||||
| -rw-r--r-- | src/widget.cpp | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/src/blitter/32bpp_anim.cpp b/src/blitter/32bpp_anim.cpp index 29c0a95ed..a7f9a2e75 100644 --- a/src/blitter/32bpp_anim.cpp +++ b/src/blitter/32bpp_anim.cpp @@ -235,7 +235,7 @@ void Blitter_32bppAnim::DrawColourMappingRect(void *dst, int width, int height, } while (--height); return; } - if (pal == PALETTE_TO_STRUCT_GREY) { + if (pal == PALETTE_NEWSPAPER) { do { for (int i = 0; i != width; i++) { *udst = MakeGrey(*udst); diff --git a/src/blitter/32bpp_simple.cpp b/src/blitter/32bpp_simple.cpp index 83c43fb27..57d0ca078 100644 --- a/src/blitter/32bpp_simple.cpp +++ b/src/blitter/32bpp_simple.cpp @@ -77,7 +77,7 @@ void Blitter_32bppSimple::DrawColourMappingRect(void *dst, int width, int height } while (--height); return; } - if (pal == PALETTE_TO_STRUCT_GREY) { + if (pal == PALETTE_NEWSPAPER) { do { for (int i = 0; i != width; i++) { *udst = MakeGrey(*udst); diff --git a/src/news_gui.cpp b/src/news_gui.cpp index 4289285fc..a1e05d074 100644 --- a/src/news_gui.cpp +++ b/src/news_gui.cpp @@ -411,7 +411,7 @@ struct NewsWindow : Window { case NTW_MGR_FACE: { const CompanyNewsInformation *cni = (const CompanyNewsInformation*)this->ni->free_data; DrawCompanyManagerFace(cni->face, cni->colour, r.left, r.top); - GfxFillRect(r.left + 1, r.top, r.left + 1 + 91, r.top + 118, PALETTE_TO_STRUCT_GREY, FILLRECT_RECOLOUR); + GfxFillRect(r.left + 1, r.top, r.left + 1 + 91, r.top + 118, PALETTE_NEWSPAPER, FILLRECT_RECOLOUR); break; } case NTW_MGR_NAME: { @@ -437,7 +437,7 @@ struct NewsWindow : Window { assert(this->ni->reftype1 == NR_ENGINE); EngineID engine = this->ni->ref1; DrawVehicleEngine(r.left, r.right, (r.left + r.right) / 2, (r.top + r.bottom) / 2, engine, GetEnginePalette(engine, _local_company)); - GfxFillRect(r.left, r.top, r.right, r.bottom, PALETTE_TO_STRUCT_GREY, FILLRECT_RECOLOUR); + GfxFillRect(r.left, r.top, r.right, r.bottom, PALETTE_NEWSPAPER, FILLRECT_RECOLOUR); break; } case NTW_VEH_INFO: { diff --git a/src/table/sprites.h b/src/table/sprites.h index e4144141e..89b938e51 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -1555,8 +1555,8 @@ static const PaletteID PALETTE_TO_STRUCT_GREEN = 0x31F; static const PaletteID PALETTE_TO_STRUCT_CONCRETE = 0x320; // Sets the suspension bridge to concrete, also other strucutures use it static const PaletteID PALETTE_TO_STRUCT_YELLOW = 0x321; // Sets the bridge colour to yellow (suspension and tubular) static const PaletteID PALETTE_TO_TRANSPARENT = 0x322; // This sets the sprite to transparent -/* This is used for changing the tubular bridges to the silicon display, or some grayish colour */ -static const PaletteID PALETTE_TO_STRUCT_GREY = 0x323; + +static const PaletteID PALETTE_NEWSPAPER = 0x323; ///< Recolour sprite for newspaper-greying. static const PaletteID PALETTE_CRASH = 0x324; /* Two recolourings only used by the church */ diff --git a/src/widget.cpp b/src/widget.cpp index 210ca6c8c..9d928f9df 100644 --- a/src/widget.cpp +++ b/src/widget.cpp @@ -1797,7 +1797,7 @@ void NWidgetViewport::Draw(const Window *w) /* Optionally shade the viewport. */ if (this->disp_flags & (ND_SHADE_GREY | ND_SHADE_DIMMED)) { GfxFillRect(this->pos_x, this->pos_y, this->pos_x + this->current_x - 1, this->pos_y + this->current_y - 1, - (this->disp_flags & ND_SHADE_DIMMED) ? PALETTE_TO_TRANSPARENT : PALETTE_TO_STRUCT_GREY, FILLRECT_RECOLOUR); + (this->disp_flags & ND_SHADE_DIMMED) ? PALETTE_TO_TRANSPARENT : PALETTE_NEWSPAPER, FILLRECT_RECOLOUR); } } |